Version in base suite: 8.2.29-1~deb12u1

Base version: php8.2_8.2.29-1~deb12u1
Target version: php8.2_8.2.30-1~deb12u1
Base file: /srv/ftp-master.debian.org/ftp/pool/main/p/php8.2/php8.2_8.2.29-1~deb12u1.dsc
Target file: /srv/ftp-master.debian.org/policy/pool/main/p/php8.2/php8.2_8.2.30-1~deb12u1.dsc

 /srv/release.debian.org/tmp/aMhZa7W7dI/php8.2-8.2.30/ext/zlib/tests/zlib_flock.txt.gz |binary
 php8.2-8.2.30/.github/CODEOWNERS                                                      |   18 
 php8.2-8.2.30/.github/actions/apt-x32/action.yml                                      |    5 
 php8.2-8.2.30/.github/actions/apt-x64/action.yml                                      |    5 
 php8.2-8.2.30/.github/actions/brew/action.yml                                         |    4 
 php8.2-8.2.30/.github/actions/configure-macos/action.yml                              |   36 
 php8.2-8.2.30/.github/actions/extra-tests/action.yml                                  |    7 
 php8.2-8.2.30/.github/actions/freebsd/action.yml                                      |   15 
 php8.2-8.2.30/.github/actions/macos-update-clang/action.yml                           |   17 
 php8.2-8.2.30/.github/actions/notify-slack/action.yml                                 |   10 
 php8.2-8.2.30/.github/actions/verify-generated-files/action.yml                       |    2 
 php8.2-8.2.30/.github/nightly_matrix.php                                              |    7 
 php8.2-8.2.30/.github/scripts/windows/find-target-branch.bat                          |    2 
 php8.2-8.2.30/.github/workflows/nightly-results.yml                                   |   16 
 php8.2-8.2.30/.github/workflows/nightly.yml                                           |  151 
 php8.2-8.2.30/.github/workflows/push.yml                                              |   18 
 php8.2-8.2.30/.github/workflows/root.yml                                              |   12 
 php8.2-8.2.30/.gitignore                                                              |    1 
 php8.2-8.2.30/NEWS                                                                    |   22 
 php8.2-8.2.30/Zend/tests/concat_003.phpt                                              |    2 
 php8.2-8.2.30/Zend/zend.h                                                             |    2 
 php8.2-8.2.30/Zend/zend_ini_parser.c                                                  |  104 
 php8.2-8.2.30/Zend/zend_ini_parser.h                                                  |    6 
 php8.2-8.2.30/Zend/zend_ini_parser.output                                             |    8 
 php8.2-8.2.30/Zend/zend_ini_scanner.c                                                 | 5353 -
 php8.2-8.2.30/Zend/zend_ini_scanner_defs.h                                            |    4 
 php8.2-8.2.30/Zend/zend_language_parser.c                                             |  117 
 php8.2-8.2.30/Zend/zend_language_parser.h                                             |    6 
 php8.2-8.2.30/Zend/zend_language_parser.output                                        |   84 
 php8.2-8.2.30/Zend/zend_language_scanner.c                                            |12758 +--
 php8.2-8.2.30/Zend/zend_language_scanner_defs.h                                       |    4 
 php8.2-8.2.30/configure                                                               |33218 ++++------
 php8.2-8.2.30/configure.ac                                                            |    2 
 php8.2-8.2.30/debian/changelog                                                        |   12 
 php8.2-8.2.30/ext/ctype/tests/lc_ctype_inheritance.phpt                               |    3 
 php8.2-8.2.30/ext/curl/interface.c                                                    |   32 
 php8.2-8.2.30/ext/curl/tests/check_win_config.phpt                                    |    2 
 php8.2-8.2.30/ext/curl/tests/curl_setopt_ssl.phpt                                     |   12 
 php8.2-8.2.30/ext/dom/document.c                                                      |   15 
 php8.2-8.2.30/ext/dom/tests/gh10234.phpt                                              |    6 
 php8.2-8.2.30/ext/hash/php_hash_xxhash.h                                              |    2 
 php8.2-8.2.30/ext/imap/tests/CONFLICTS                                                |    1 
 php8.2-8.2.30/ext/intl/tests/msgfmt_format_intlcalendar_variant4.phpt                 |    4 
 php8.2-8.2.30/ext/intl/tests/timezone_getDisplayName_variant4.phpt                    |    8 
 php8.2-8.2.30/ext/json/json_parser.tab.c                                              |   99 
 php8.2-8.2.30/ext/json/json_parser.tab.h                                              |    6 
 php8.2-8.2.30/ext/json/json_scanner.c                                                 | 1824 
 php8.2-8.2.30/ext/json/php_json_scanner_defs.h                                        |    4 
 php8.2-8.2.30/ext/libxml/libxml.c                                                     |    5 
 php8.2-8.2.30/ext/opcache/jit/zend_jit.c                                              |    8 
 php8.2-8.2.30/ext/openssl/tests/bug74341.phpt                                         |    1 
 php8.2-8.2.30/ext/openssl/tests/check_default_conf_path.phpt                          |    1 
 php8.2-8.2.30/ext/openssl/tests/openssl_x509_parse_basic.phpt                         |    1 
 php8.2-8.2.30/ext/pcre/tests/grep2.phpt                                               |    2 
 php8.2-8.2.30/ext/pcre/tests/pcre_extra.phpt                                          |    4 
 php8.2-8.2.30/ext/pcre/tests/split.phpt                                               |    2 
 php8.2-8.2.30/ext/pdo/pdo_sql_parser.c                                                |  450 
 php8.2-8.2.30/ext/pdo/pdo_sql_parser.re                                               |    6 
 php8.2-8.2.30/ext/pdo_pgsql/tests/ghsa-8xr5-qppj-gvwj.phpt                            |   28 
 php8.2-8.2.30/ext/phar/phar_path_check.c                                              |  179 
 php8.2-8.2.30/ext/phar/tests/tar/bug70417.phpt                                        |   21 
 php8.2-8.2.30/ext/standard/array.c                                                    |    7 
 php8.2-8.2.30/ext/standard/basic_functions.c                                          |   12 
 php8.2-8.2.30/ext/standard/dns.c                                                      |    6 
 php8.2-8.2.30/ext/standard/dns_win32.c                                                |    6 
 php8.2-8.2.30/ext/standard/image.c                                                    |    1 
 php8.2-8.2.30/ext/standard/tests/array/GHSA-h96m-rvf9-jgm2.phpt                       |   16 
 php8.2-8.2.30/ext/standard/tests/file/chmod_variation2.phpt                           |    2 
 php8.2-8.2.30/ext/standard/tests/file/file_variation5.phpt                            |    2 
 php8.2-8.2.30/ext/standard/tests/image/gh20584.phpt                                   |   39 
 php8.2-8.2.30/ext/standard/tests/mail/CONFLICTS                                       |    1 
 php8.2-8.2.30/ext/standard/tests/network/ghsa-www2-q4fc-65wf.phpt                     |   62 
 php8.2-8.2.30/ext/standard/tests/network/udp4loop.phpt                                |    2 
 php8.2-8.2.30/ext/standard/url_scanner_ex.c                                           |  556 
 php8.2-8.2.30/ext/standard/var_unserializer.c                                         |  544 
 php8.2-8.2.30/ext/xml/compat.c                                                        |   19 
 php8.2-8.2.30/ext/zlib/tests/zlib_wrapper_flock_basic.phpt                            |    2 
 php8.2-8.2.30/main/php_config.h.in                                                    |  438 
 php8.2-8.2.30/main/php_version.h                                                      |    6 
 php8.2-8.2.30/run-extra-tests.php                                                     |  123 
 php8.2-8.2.30/run-tests.php                                                           |    9 
 php8.2-8.2.30/sapi/fpm/fpm/fpm_php_trace.c                                            |   11 
 php8.2-8.2.30/sapi/fpm/fpm/fpm_stdio.c                                                |    5 
 php8.2-8.2.30/sapi/fpm/tests/bug68591-conf-test-group.phpt                            |    1 
 php8.2-8.2.30/sapi/fpm/tests/bug68591-conf-test-user.phpt                             |    1 
 php8.2-8.2.30/sapi/fpm/tests/bug74083-concurrent-reload.phpt                          |    1 
 php8.2-8.2.30/sapi/fpm/tests/bug76601-reload-child-signals.phpt                       |    1 
 php8.2-8.2.30/sapi/phpdbg/phpdbg_lexer.c                                              | 3026 
 php8.2-8.2.30/sapi/phpdbg/phpdbg_parser.c                                             |  102 
 php8.2-8.2.30/sapi/phpdbg/phpdbg_parser.h                                             |    6 
 php8.2-8.2.30/sapi/phpdbg/phpdbg_parser.output                                        |    4 
 91 files changed, 27808 insertions(+), 31957 deletions(-)

dpkg-source: warning: cannot verify inline signature for /srv/release.debian.org/tmp/tmpv6me1o3k/php8.2_8.2.29-1~deb12u1.dsc: no acceptable signature found
dpkg-source: warning: cannot verify inline signature for /srv/release.debian.org/tmp/tmpv6me1o3k/php8.2_8.2.30-1~deb12u1.dsc: no acceptable signature found
diff -Nru php8.2-8.2.29/.github/CODEOWNERS php8.2-8.2.30/.github/CODEOWNERS
--- php8.2-8.2.29/.github/CODEOWNERS	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/.github/CODEOWNERS	2025-12-16 17:18:12.000000000 +0000
@@ -16,11 +16,11 @@
 
 /.github @TimWolla
 /build/gen_stub.php @kocsismate
-/ext/bcmath @Girgias @nielsdos @SakiTakamachi
+/ext/bcmath @Girgias @ndossche @SakiTakamachi
 /ext/curl @adoy
 /ext/date @derickr
 /ext/dba @Girgias
-/ext/dom @nielsdos
+/ext/dom @ndossche
 /ext/ffi @dstogov
 /ext/gd @devnexen
 /ext/gettext @devnexen
@@ -28,7 +28,7 @@
 /ext/imap @Girgias
 /ext/intl @devnexen
 /ext/json @bukka
-/ext/libxml @nielsdos
+/ext/libxml @ndossche
 /ext/mbstring @alexdowad @youkidearitai
 /ext/mysqli @bukka @kamil-tekiela
 /ext/mysqlnd @bukka @kamil-tekiela @SakiTakamachi
@@ -46,15 +46,15 @@
 /ext/pgsql @devnexen
 /ext/random @TimWolla @zeriyoshi
 /ext/session @Girgias
-/ext/simplexml @nielsdos
-/ext/soap @nielsdos
+/ext/simplexml @ndossche
+/ext/soap @ndossche
 /ext/sockets @devnexen
 /ext/spl @Girgias
 /ext/standard @bukka
-/ext/xml @nielsdos
-/ext/xmlreader @nielsdos
-/ext/xmlwriter @nielsdos
-/ext/xsl @nielsdos
+/ext/xml @ndossche
+/ext/xmlreader @ndossche
+/ext/xmlwriter @ndossche
+/ext/xsl @ndossche
 /main @bukka
 /sapi/fpm @bukka
 /Zend/Optimizer @dstogov
diff -Nru php8.2-8.2.29/.github/actions/apt-x32/action.yml php8.2-8.2.30/.github/actions/apt-x32/action.yml
--- php8.2-8.2.29/.github/actions/apt-x32/action.yml	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/.github/actions/apt-x32/action.yml	2025-12-16 17:18:12.000000000 +0000
@@ -6,6 +6,8 @@
       run: |
         set -x
 
+        OPCACHE_TLS_TESTS_DEPS="gcc clang lld"
+
         export DEBIAN_FRONTEND=noninteractive
         dpkg --add-architecture i386
         apt-get update -y | true
@@ -50,4 +52,5 @@
           re2c \
           unzip \
           wget \
-          zlib1g-dev:i386
+          zlib1g-dev:i386 \
+          $OPCACHE_TLS_TESTS_DEPS
diff -Nru php8.2-8.2.29/.github/actions/apt-x64/action.yml php8.2-8.2.30/.github/actions/apt-x64/action.yml
--- php8.2-8.2.29/.github/actions/apt-x64/action.yml	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/.github/actions/apt-x64/action.yml	2025-12-16 17:18:12.000000000 +0000
@@ -6,6 +6,8 @@
       run: |
         set -x
 
+        OPCACHE_TLS_TESTS_DEPS="gcc clang lld"
+
         sudo apt-get update
         sudo apt-get install \
           bison \
@@ -58,4 +60,5 @@
           libqdbm-dev \
           libjpeg-dev \
           libpng-dev \
-          libfreetype6-dev
+          libfreetype6-dev \
+          $OPCACHE_TLS_TESTS_DEPS
diff -Nru php8.2-8.2.29/.github/actions/brew/action.yml php8.2-8.2.30/.github/actions/brew/action.yml
--- php8.2-8.2.29/.github/actions/brew/action.yml	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/.github/actions/brew/action.yml	2025-12-16 17:18:12.000000000 +0000
@@ -11,10 +11,14 @@
         code=" keg.link\(verbose: verbose\?"
         sudo sed -Ei '' "s/$code.*/$code, overwrite: true\)/" "$formula_installer"
 
+        # Some packages exist on x86 but not arm, or vice versa.
+        # Install them with reinstall to avoid warnings.
+        brew reinstall autoconf webp tidy-html5 libzip libsodium icu4c
         brew install \
           bison \
           re2c
         brew install \
+          aspell \
           bzip2 \
           enchant \
           libffi \
diff -Nru php8.2-8.2.29/.github/actions/configure-macos/action.yml php8.2-8.2.30/.github/actions/configure-macos/action.yml
--- php8.2-8.2.29/.github/actions/configure-macos/action.yml	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/.github/actions/configure-macos/action.yml	2025-12-16 17:18:12.000000000 +0000
@@ -10,15 +10,15 @@
       run: |
         set -x
         BREW_OPT="$(brew --prefix)"/opt
-        export PATH="/usr/local/opt/bison/bin:$PATH"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/openssl@1.1/lib/pkgconfig"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/curl/lib/pkgconfig"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/krb5/lib/pkgconfig"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libffi/lib/pkgconfig"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxml2/lib/pkgconfig"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/libxslt/lib/pkgconfig"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/zlib/lib/pkgconfig"
-        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/icu4c/lib/pkgconfig"
+        export PATH="$BREW_OPT/bison/bin:$PATH"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/openssl@1.1/lib/pkgconfig"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/curl/lib/pkgconfig"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/krb5/lib/pkgconfig"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libffi/lib/pkgconfig"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libxml2/lib/pkgconfig"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/libxslt/lib/pkgconfig"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/zlib/lib/pkgconfig"
+        export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$BREW_OPT/icu4c/lib/pkgconfig"
         sed -i -e 's/Requires.private:.*//g' "$BREW_OPT/curl/lib/pkgconfig/libcurl.pc"
         ./buildconf --force
         ./configure \
@@ -28,8 +28,8 @@
           --enable-fpm \
           --with-pdo-mysql=mysqlnd \
           --with-mysqli=mysqlnd \
-          --with-pgsql=/usr/local/opt/libpq \
-          --with-pdo-pgsql=/usr/local/opt/libpq \
+          --with-pgsql="$BREW_OPT"/libpq \
+          --with-pdo-pgsql="$BREW_OPT"/libpq \
           --with-pdo-sqlite \
           --without-pear \
           --enable-gd \
@@ -42,25 +42,25 @@
           --enable-soap \
           --enable-xmlreader \
           --with-xsl \
-          --with-tidy=/usr/local/opt/tidy-html5 \
+          --with-tidy="$BREW_OPT"/tidy-html5 \
           --with-libxml \
           --enable-sysvsem \
           --enable-sysvshm \
           --enable-shmop \
           --enable-pcntl \
-          --with-readline=/usr/local/opt/readline \
+          --with-readline="$BREW_OPT"/readline \
           --enable-mbstring \
           --with-curl \
-          --with-gettext=/usr/local/opt/gettext \
+          --with-gettext="$BREW_OPT"/gettext \
           --enable-sockets \
-          --with-bz2=/usr/local/opt/bzip2 \
+          --with-bz2="$BREW_OPT"/bzip2 \
           --with-openssl \
-          --with-gmp=/usr/local/opt/gmp \
-          --with-iconv=/usr/local/opt/libiconv \
+          --with-gmp="$BREW_OPT"/gmp \
+          --with-iconv="$BREW_OPT"/libiconv \
           --enable-bcmath \
           --enable-calendar \
           --enable-ftp \
-          --with-pspell=/usr/local/opt/aspell \
+          --with-pspell="$BREW_OPT"/aspell \
           --with-kerberos \
           --enable-sysvmsg \
           --with-ffi \
diff -Nru php8.2-8.2.29/.github/actions/extra-tests/action.yml php8.2-8.2.30/.github/actions/extra-tests/action.yml
--- php8.2-8.2.29/.github/actions/extra-tests/action.yml	1970-01-01 00:00:00.000000000 +0000
+++ php8.2-8.2.30/.github/actions/extra-tests/action.yml	2025-12-16 17:18:12.000000000 +0000
@@ -0,0 +1,7 @@
+name: Extra tests
+runs:
+  using: composite
+  steps:
+    - shell: sh
+      run: |
+        sapi/cli/php run-extra-tests.php
diff -Nru php8.2-8.2.29/.github/actions/freebsd/action.yml php8.2-8.2.30/.github/actions/freebsd/action.yml
--- php8.2-8.2.29/.github/actions/freebsd/action.yml	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/.github/actions/freebsd/action.yml	2025-12-16 17:18:12.000000000 +0000
@@ -3,13 +3,16 @@
   configurationParameters:
     default: ''
     required: false
+  runExtraTests:
+    default: false
+    required: false
 runs:
   using: composite
   steps:
     - name: FreeBSD
       uses: vmactions/freebsd-vm@v1
       with:
-        release: '13.3'
+        release: '13.5'
         usesh: true
         copyback: false
         # Temporarily disable sqlite, as FreeBSD ships it with disabled double quotes. We'll need to fix our tests.
@@ -17,6 +20,8 @@
         prepare: |
           cd $GITHUB_WORKSPACE
 
+          OPCACHE_TLS_TESTS_DEPS="gcc"
+
           kldload accf_http
           pkg install -y \
             autoconf \
@@ -41,9 +46,11 @@
             webp \
             libavif \
             `#sqlite3` \
-            curl
+            curl \
+            $OPCACHE_TLS_TESTS_DEPS
 
           ./buildconf -f
+          CC=clang CXX=clang++ \
           ./configure \
             --prefix=/usr/local \
             --enable-debug \
@@ -107,3 +114,7 @@
             --show-slow 1000 \
             --set-timeout 120 \
             -d zend_extension=opcache.so
+
+          if test "${{ inputs.runExtraTests }}" = "true"; then
+            sapi/cli/php run-extra-tests.php
+          fi
diff -Nru php8.2-8.2.29/.github/actions/macos-update-clang/action.yml php8.2-8.2.30/.github/actions/macos-update-clang/action.yml
--- php8.2-8.2.29/.github/actions/macos-update-clang/action.yml	1970-01-01 00:00:00.000000000 +0000
+++ php8.2-8.2.30/.github/actions/macos-update-clang/action.yml	2025-12-16 17:18:12.000000000 +0000
@@ -0,0 +1,17 @@
+name: Update clang
+runs:
+  using: composite
+  steps:
+    - shell: bash
+      run: |
+        softwareupdate -l
+        label=$((softwareupdate -l 2>/dev/null | grep 'Label:' | grep -o 'Command Line Tools for Xcode.*' | head -1) || echo '')
+        if [ -n "$label" ]; then
+          softwareupdate -i "$label"
+          xcode_path=$(ls -1 '/Applications' | grep 'Xcode_.*\.app' | sort -r | head -1)
+          sudo xcode-select -s "/Applications/$xcode_path"
+        else
+          echo "Not found."
+        fi
+        which clang
+        clang -v
diff -Nru php8.2-8.2.29/.github/actions/notify-slack/action.yml php8.2-8.2.30/.github/actions/notify-slack/action.yml
--- php8.2-8.2.29/.github/actions/notify-slack/action.yml	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/.github/actions/notify-slack/action.yml	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-name: Notify Slack
-inputs:
-  token:
-    required: true
-runs:
-  using: composite
-  steps:
-    - shell: bash
-      run: >-
-        curl -X POST -H 'Content-type: application/json' --data '{"attachments": [{"text": "Job in *nightly* failed", "footer": "<https://github.com/php/php-src/actions/runs/${{ github.run_id }}|View Run>", "color": "danger", "mrkdwn_in": ["text"]}]}' ${{ inputs.token }}
diff -Nru php8.2-8.2.29/.github/actions/verify-generated-files/action.yml php8.2-8.2.30/.github/actions/verify-generated-files/action.yml
--- php8.2-8.2.29/.github/actions/verify-generated-files/action.yml	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/.github/actions/verify-generated-files/action.yml	2025-12-16 17:18:12.000000000 +0000
@@ -5,7 +5,7 @@
     - shell: bash
       run: |
         set -x
-        [[ "$OSTYPE" == "darwin"* ]] && export PATH="/usr/local/opt/bison/bin:$PATH"
+        [[ "$OSTYPE" == "darwin"* ]] && export PATH="$(brew --prefix)/opt/bison/bin:$PATH"
         scripts/dev/credits
         scripts/dev/genfiles
         Zend/zend_vm_gen.php
diff -Nru php8.2-8.2.29/.github/nightly_matrix.php php8.2-8.2.30/.github/nightly_matrix.php
--- php8.2-8.2.29/.github/nightly_matrix.php	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/.github/nightly_matrix.php	2025-12-16 17:18:12.000000000 +0000
@@ -1,7 +1,8 @@
 <?php
 
 const BRANCHES = [
-    ['ref' => 'master', 'version' => [8, 5]],
+    ['ref' => 'master', 'version' => [8, 6]],
+    ['ref' => 'PHP-8.5', 'version' => [8, 5]],
     ['ref' => 'PHP-8.4', 'version' => [8, 4]],
     ['ref' => 'PHP-8.3', 'version' => [8, 3]],
     ['ref' => 'PHP-8.2', 'version' => [8, 2]],
@@ -48,8 +49,8 @@
 
 $trigger = $argv[1] ?? 'schedule';
 $attempt = (int) ($argv[2] ?? 1);
-$monday = date('w', time()) === '1';
-$discard_cache = $monday
+$sunday = date('w', time()) === '0';
+$discard_cache = $sunday
     || ($trigger === 'schedule' && $attempt !== 1)
     || $trigger === 'workflow_dispatch';
 if ($discard_cache) {
diff -Nru php8.2-8.2.29/.github/scripts/windows/find-target-branch.bat php8.2-8.2.30/.github/scripts/windows/find-target-branch.bat
--- php8.2-8.2.29/.github/scripts/windows/find-target-branch.bat	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/.github/scripts/windows/find-target-branch.bat	2025-12-16 17:18:12.000000000 +0000
@@ -3,6 +3,6 @@
 for /f "usebackq tokens=3" %%i in (`findstr PHP_MAJOR_VERSION main\php_version.h`) do set BRANCH=%%i
 for /f "usebackq tokens=3" %%i in (`findstr PHP_MINOR_VERSION main\php_version.h`) do set BRANCH=%BRANCH%.%%i
 
-if /i "%BRANCH%" equ "8.3" (
+if /i "%BRANCH%" equ "8.6" (
 	set BRANCH=master
 )
diff -Nru php8.2-8.2.29/.github/workflows/nightly-results.yml php8.2-8.2.30/.github/workflows/nightly-results.yml
--- php8.2-8.2.29/.github/workflows/nightly-results.yml	1970-01-01 00:00:00.000000000 +0000
+++ php8.2-8.2.30/.github/workflows/nightly-results.yml	2025-12-16 17:18:12.000000000 +0000
@@ -0,0 +1,16 @@
+name: Nightly results
+on:
+  workflow_run:
+    workflows:
+      - Nightly
+    types:
+      - completed
+jobs:
+  on-failure:
+    runs-on: ubuntu-latest
+    if: ${{ github.repository == 'php/php-src' && github.event.workflow_run.conclusion == 'failure' }}
+    steps:
+      - run: |
+          export DEBIAN_FRONTEND=noninteractive
+          sudo apt-get install -y curl
+          curl -X POST -H 'Content-type: application/json' --data '{"attachments": [{"text": "Job(s) in *nightly* failed", "footer": "<${{ github.event.workflow_run.html_url }}|View Run>", "color": "danger", "mrkdwn_in": ["text"]}]}' ${{ secrets.ACTION_MONITORING_SLACK }}
diff -Nru php8.2-8.2.29/.github/workflows/nightly.yml php8.2-8.2.30/.github/workflows/nightly.yml
--- php8.2-8.2.29/.github/workflows/nightly.yml	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/.github/workflows/nightly.yml	2025-12-16 17:18:12.000000000 +0000
@@ -38,12 +38,15 @@
       skip_laravel:
         required: true
         type: boolean
-      skip_symfony:
+      symfony_version:
         required: true
-        type: boolean
+        type: string
       skip_wordpress:
         required: true
         type: boolean
+      variation_enable_zend_max_execution_timers:
+        required: true
+        type: boolean
 permissions:
   contents: read
 jobs:
@@ -54,7 +57,7 @@
     runs-on: [self-hosted, gentoo, ppc64]
     steps:
       - name: git checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ inputs.branch }}
       - name: System info
@@ -85,24 +88,21 @@
         with:
           runTestsParameters: >-
             --asan -x
+      - name: Extra tests
+        uses: ./.github/actions/extra-tests
   ALPINE:
     if: inputs.run_alpine
     name: ALPINE_X64_ASAN_UBSAN_DEBUG_ZTS
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
-      image: 'alpine:3.20.1'
+      image: 'alpine:3.22'
     steps:
       - name: git checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ inputs.branch }}
       - name: apk
         uses: ./.github/actions/apk
-      - name: LLVM 17 (ASAN-only)
-        # libclang_rt.asan-x86_64.a is provided by compiler-rt, and only for clang17:
-        # https://pkgs.alpinelinux.org/contents?file=libclang_rt.asan-x86_64.a&path=&name=&branch=v3.20
-        run: |
-          apk add clang17 compiler-rt
       - name: System info
         run: |
           echo "::group::Show host CPU info"
@@ -117,8 +117,8 @@
           configurationParameters: >-
             CFLAGS="-fsanitize=undefined,address -fno-sanitize=function -DZEND_TRACK_ARENA_ALLOC"
             LDFLAGS="-fsanitize=undefined,address -fno-sanitize=function"
-            CC=clang-17
-            CXX=clang++-17
+            CC=clang-20
+            CXX=clang++-20
             --enable-debug
             --enable-zts
           skipSlow: true # FIXME: This should likely include slow extensions
@@ -134,12 +134,8 @@
             --asan -x
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
-      - name: Notify Slack
-        if: failure()
-        uses: ./.github/actions/notify-slack
-        with:
-          token: ${{ secrets.ACTION_MONITORING_SLACK }}
-
+      - name: Extra tests
+        uses: ./.github/actions/extra-tests
   LINUX_X64:
     services:
       mysql:
@@ -195,6 +191,7 @@
             zts: true
             configuration_parameters: >-
               CFLAGS="-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1 -DZEND_VERIFY_TYPE_INFERENCE"
+              ${{ inputs.variation_enable_zend_max_execution_timers && '--enable-zend-max-execution-timers' || '' }}
             run_tests_parameters: -d zend_test.observer.enabled=1 -d zend_test.observer.show_output=0
             timeout_minutes: 360
             test_function_jit: true
@@ -203,7 +200,7 @@
     runs-on: ubuntu-${{ matrix.asan && inputs.asan_ubuntu_version || inputs.ubuntu_version }}
     steps:
       - name: git checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ inputs.branch }}
       - name: Create MSSQL container
@@ -266,13 +263,10 @@
             ${{ matrix.run_tests_parameters }}
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
+      - name: Extra tests
+        uses: ./.github/actions/extra-tests
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
-      - name: Notify Slack
-        if: failure()
-        uses: ./.github/actions/notify-slack
-        with:
-          token: ${{ secrets.ACTION_MONITORING_SLACK }}
   LINUX_X32:
     strategy:
       fail-fast: false
@@ -304,7 +298,7 @@
           FIREBIRD_PASSWORD: test
     steps:
       - name: git checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ inputs.branch }}
       - name: apt
@@ -355,11 +349,8 @@
             ${{ matrix.run_tests_parameters }}
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
-      - name: Notify Slack
-        if: failure()
-        uses: ./.github/actions/notify-slack
-        with:
-          token: ${{ secrets.ACTION_MONITORING_SLACK }}
+      - name: Extra tests
+        uses: ./.github/actions/extra-tests
   MACOS:
     strategy:
       fail-fast: false
@@ -373,9 +364,11 @@
     runs-on: macos-${{ matrix.os }}
     steps:
       - name: git checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ inputs.branch }}
+      - name: Update clang
+        uses: ./.github/actions/macos-update-clang
       - name: brew
         uses: ./.github/actions/brew
       - name: ./configure
@@ -414,13 +407,10 @@
           runTestsParameters: >-
             -d zend_extension=opcache.so
             -d opcache.enable_cli=1
+      - name: Extra tests
+        uses: ./.github/actions/extra-tests
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
-      - name: Notify Slack
-        if: failure()
-        uses: ./.github/actions/notify-slack
-        with:
-          token: ${{ secrets.ACTION_MONITORING_SLACK }}
   COVERAGE_DEBUG_NTS:
     if: inputs.branch == 'master'
     services:
@@ -449,7 +439,7 @@
     runs-on: ubuntu-22.04
     steps:
       - name: git checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ inputs.branch }}
       - name: Create MSSQL container
@@ -482,11 +472,6 @@
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }}
           verbose: true
-      - name: Notify Slack
-        if: failure()
-        uses: ./.github/actions/notify-slack
-        with:
-          token: ${{ secrets.ACTION_MONITORING_SLACK }}
   COMMUNITY:
     strategy:
       fail-fast: false
@@ -503,7 +488,7 @@
       USE_TRACKED_ALLOC: 1
     steps:
       - name: git checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ inputs.branch }}
       - name: apt
@@ -555,14 +540,17 @@
           repositories="amp cache dns file http parallel parser pipeline process serialization socket sync websocket-client websocket-server"
           X=0
           for repository in $repositories; do
-            printf "Testing amp/%s\n" "$repository"
+            echo "::group::$repository"
             git clone "https://github.com/amphp/$repository.git" "amphp-$repository" --depth 1
             cd "amphp-$repository"
             git rev-parse HEAD
             php /usr/bin/composer install --no-progress --ignore-platform-req=php+
+            EXIT_CODE=0
             vendor/bin/phpunit || EXIT_CODE=$?
+            echo -e "\n::endgroup::"
             if [ ${EXIT_CODE:-0} -gt 128 ]; then
               X=1;
+              echo "Failed"
             fi
             cd ..
           done
@@ -586,14 +574,17 @@
           repositories="async cache child-process datagram dns event-loop promise promise-stream promise-timer stream"
           X=0
           for repository in $repositories; do
-            printf "Testing reactphp/%s\n" "$repository"
+            echo "::group::$repository"
             git clone "https://github.com/reactphp/$repository.git" "reactphp-$repository" --depth 1
             cd "reactphp-$repository"
             git rev-parse HEAD
             php /usr/bin/composer install --no-progress --ignore-platform-req=php+
+            EXIT_CODE=0
             vendor/bin/phpunit || EXIT_CODE=$?
+            echo -e "\n::endgroup::"
             if [ $[EXIT_CODE:-0} -gt 128 ]; then
               X=1;
+              echo "Failed"
             fi
             cd ..
           done
@@ -610,23 +601,27 @@
             exit 1
           fi
       - name: Test Symfony
-        if: ${{ !cancelled() && !inputs.skip_symfony }}
+        if: ${{ !cancelled() && inputs.symfony_version != '' }}
         run: |
-          git clone https://github.com/symfony/symfony.git --depth=1
+          git clone https://github.com/symfony/symfony.git --depth=1 --branch="${{ inputs.symfony_version }}"
           cd symfony
           git rev-parse HEAD
           php /usr/bin/composer install --no-progress --ignore-platform-req=php+
           php ./phpunit install
           # Test causes a heap-buffer-overflow but I cannot reproduce it locally...
-          php -r '$c = file_get_contents("src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerCustomTest.php"); $c = str_replace("public function testSanitizeDeepNestedString()", "/** @group skip */\n    public function testSanitizeDeepNestedString()", $c); file_put_contents("src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerCustomTest.php", $c);'
+          php -r '$c = file_get_contents("src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerCustomTest.php"); $c = str_replace("public function testSanitizeDeepNestedString()", "#[\\PHPUnit\\Framework\\Attributes\\Group('"'"'skip'"'"')]\n    public function testSanitizeDeepNestedString()", $c); file_put_contents("src/Symfony/Component/HtmlSanitizer/Tests/HtmlSanitizerCustomTest.php", $c);'
           # Buggy FFI test in Symfony, see https://github.com/symfony/symfony/issues/47668
-          php -r '$c = file_get_contents("src/Symfony/Component/VarDumper/Tests/Caster/FFICasterTest.php"); $c = str_replace("public function testCastNonTrailingCharPointer()", "/** @group skip */\n    public function testCastNonTrailingCharPointer()", $c); file_put_contents("src/Symfony/Component/VarDumper/Tests/Caster/FFICasterTest.php", $c);'
+          php -r '$c = file_get_contents("src/Symfony/Component/VarDumper/Tests/Caster/FFICasterTest.php"); $c = str_replace("public function testCastNonTrailingCharPointer()", "#[\\PHPUnit\\Framework\\Attributes\\Group('"'"'skip'"'"')]\n    public function testCastNonTrailingCharPointer()", $c); file_put_contents("src/Symfony/Component/VarDumper/Tests/Caster/FFICasterTest.php", $c);'
           export SYMFONY_DEPRECATIONS_HELPER=max[total]=999
           X=0
           for component in $(find src/Symfony -mindepth 2 -type f -name phpunit.xml.dist -printf '%h\n'); do
-            php ./phpunit $component --exclude-group tty,benchmark,intl-data,transient --exclude-group skip || EXIT_CODE=$?
+            echo "::group::$component"
+            EXIT_CODE=0
+            php ./phpunit $component --exclude-group tty --exclude-group benchmark --exclude-group intl-data --exclude-group transient --exclude-group skip || EXIT_CODE=$?
+            echo -e "\n::endgroup::"
             if [ ${EXIT_CODE:-0} -gt 128 ]; then
               X=1;
+              echo "Failed"
             fi
           done
           exit $X
@@ -642,7 +637,8 @@
             exit 1
           fi
       - name: 'Symfony Preloading'
-        if: ${{ !cancelled() && !inputs.skip_symfony }}
+        # composer create-project will automatically pick the right Symfony version for us.
+        if: ${{ !cancelled() && inputs.symfony_version != '' }}
         run: |
           php /usr/bin/composer create-project symfony/symfony-demo symfony_demo --no-progress --ignore-platform-req=php+
           cd symfony_demo
@@ -664,11 +660,6 @@
           if [ $EXIT_CODE -gt 128 ]; then
             exit 1
           fi
-      - name: Notify Slack
-        if: failure()
-        uses: ./.github/actions/notify-slack
-        with:
-          token: ${{ secrets.ACTION_MONITORING_SLACK }}
   OPCACHE_VARIATION:
     services:
       mysql:
@@ -697,7 +688,7 @@
     runs-on: ubuntu-${{ inputs.ubuntu_version }}
     steps:
       - name: git checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ inputs.branch }}
       - name: Create MSSQL container
@@ -755,17 +746,12 @@
             -d opcache.file_cache_only=1
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
-      - name: Notify Slack
-        if: failure()
-        uses: ./.github/actions/notify-slack
-        with:
-          token: ${{ secrets.ACTION_MONITORING_SLACK }}
   MSAN:
     name: MSAN
     runs-on: ubuntu-${{ inputs.ubuntu_version }}
     steps:
       - name: git checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ inputs.branch }}
       - name: apt
@@ -847,17 +833,12 @@
             -d opcache.enable_cli=1
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
-      - name: Notify Slack
-        if: failure()
-        uses: ./.github/actions/notify-slack
-        with:
-          token: ${{ secrets.ACTION_MONITORING_SLACK }}
   LIBMYSQLCLIENT:
     name: LIBMYSQLCLIENT
     runs-on: ubuntu-${{ inputs.ubuntu_version }}
     steps:
       - name: git checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ inputs.branch }}
       - name: apt
@@ -894,11 +875,6 @@
           withMysqli: ${{ inputs.libmysqlclient_with_mysqli }}
       - name: Verify generated files are up to date
         uses: ./.github/actions/verify-generated-files
-      - name: Notify Slack
-        if: failure()
-        uses: ./.github/actions/notify-slack
-        with:
-          token: ${{ secrets.ACTION_MONITORING_SLACK }}
   PECL:
     if: inputs.branch == 'master'
     runs-on: ubuntu-22.04
@@ -907,38 +883,38 @@
       CXX: ccache g++
     steps:
       - name: git checkout PHP
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: php
           ref: ${{ inputs.branch }}
       - name: git checkout apcu
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: krakjoe/apcu
           path: apcu
       - name: git checkout imagick
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: Imagick/imagick
           path: imagick
       - name: git checkout memcached
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: php-memcached-dev/php-memcached
           path: memcached
       - name: git checkout redis
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: phpredis/phpredis
           path: redis
       - name: git checkout xdebug
         if: false
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: xdebug/xdebug
           path: xdebug
       - name: git checkout yaml
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: php/pecl-file_formats-yaml
           path: yaml
@@ -1006,11 +982,6 @@
           /opt/php/bin/phpize
           ./configure --prefix=/opt/php --with-php-config=/opt/php/bin/php-config
           make -j$(/usr/bin/nproc)
-      - name: Notify Slack
-        if: failure()
-        uses: ./.github/actions/notify-slack
-        with:
-          token: ${{ secrets.ACTION_MONITORING_SLACK }}
   WINDOWS:
     strategy:
       fail-fast: false
@@ -1048,7 +1019,7 @@
       - name: git config
         run: git config --global core.autocrlf false && git config --global core.eol lf
       - name: git checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ inputs.branch }}
       - name: Setup
@@ -1066,9 +1037,10 @@
           - zts: ${{ !inputs.run_freebsd_zts && true || '*never*' }}
     name: "FREEBSD_${{ matrix.zts && 'ZTS' || 'NTS' }}"
     runs-on: ubuntu-latest
+    timeout-minutes: 50
     steps:
       - name: git checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ inputs.branch }}
       - name: FreeBSD
@@ -1076,3 +1048,4 @@
         with:
           configurationParameters: >-
             --${{ matrix.zts && 'enable' || 'disable' }}-zts
+          runExtraTests: true
diff -Nru php8.2-8.2.29/.github/workflows/push.yml php8.2-8.2.30/.github/workflows/push.yml
--- php8.2-8.2.29/.github/workflows/push.yml	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/.github/workflows/push.yml	2025-12-16 17:18:12.000000000 +0000
@@ -72,7 +72,7 @@
     runs-on: ubuntu-22.04
     steps:
       - name: git checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Create MSSQL container
         uses: ./.github/actions/setup-mssql
       - name: Create Oracle container
@@ -132,7 +132,7 @@
           MYSQL_ROOT_PASSWORD: root
     steps:
       - name: git checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: apt
         uses: ./.github/actions/apt-x32
       - name: ccache
@@ -140,6 +140,7 @@
         with:
           key: "${{github.job}}-${{hashFiles('main/php_version.h')}}"
           append-timestamp: false
+          save: ${{ github.event_name != 'pull_request' }}
       - name: ./configure
         uses: ./.github/actions/configure-x32
         with:
@@ -159,10 +160,12 @@
             -d opcache.enable_cli=1
   MACOS_DEBUG_NTS:
     if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - name: git checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
+      - name: Update clang
+        uses: ./.github/actions/macos-update-clang
       - name: brew
         uses: ./.github/actions/brew
       - name: ccache
@@ -177,7 +180,7 @@
           configurationParameters: --enable-debug --disable-zts
       - name: make
         run: |-
-          export PATH="/usr/local/opt/bison/bin:$PATH"
+          export PATH="$(brew --prefix)/opt/bison/bin:$PATH"
           make -j$(sysctl -n hw.logicalcpu) >/dev/null
       - name: make install
         run: sudo make install
@@ -210,7 +213,7 @@
       - name: git config
         run: git config --global core.autocrlf false && git config --global core.eol lf
       - name: git checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Setup
         uses: ./.github/actions/setup-windows
       - name: Build
@@ -221,8 +224,9 @@
     if: github.repository == 'php/php-src' || github.event_name == 'pull_request'
     name: FREEBSD
     runs-on: ubuntu-latest
+    timeout-minutes: 50
     steps:
       - name: git checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: FreeBSD
         uses: ./.github/actions/freebsd
diff -Nru php8.2-8.2.29/.github/workflows/root.yml php8.2-8.2.30/.github/workflows/root.yml
--- php8.2-8.2.29/.github/workflows/root.yml	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/.github/workflows/root.yml	2025-12-16 17:18:12.000000000 +0000
@@ -13,7 +13,7 @@
     outputs:
       branches: ${{ steps.set-matrix.outputs.branches }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           # Set fetch-depth to 0 to clone the full repository
           # including all branches. This is required to find
@@ -31,11 +31,6 @@
       - name: Generate Matrix
         id: set-matrix
         run: php .github/nightly_matrix.php "${{ github.event_name }}" "${{ github.run_attempt }}" "${{ github.head_ref || github.ref_name }}"
-      - name: Notify Slack
-        if: failure()
-        uses: ./.github/actions/notify-slack
-        with:
-          token: ${{ secrets.ACTION_MONITORING_SLACK }}
   NIGHTLY:
     needs: GENERATE_MATRIX
     name: ${{ matrix.branch.ref }}
@@ -62,6 +57,9 @@
       windows_version: '2022'
       vs_crt_version: ${{ ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) && 'vs17') || 'vs16' }}
       skip_laravel: ${{ matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1 }}
-      skip_symfony: ${{ matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1 }}
+      symfony_version: ${{ (((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 4) || matrix.branch.version[0] >= 9) && '8.1')
+        || ((matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 2) && '7.4')
+        || '' }}
       skip_wordpress: ${{ matrix.branch.version[0] == 8 && matrix.branch.version[1] == 1 }}
+      variation_enable_zend_max_execution_timers: ${{ (matrix.branch.version[0] == 8 && matrix.branch.version[1] >= 3) || matrix.branch.version[0] >= 9 }}
     secrets: inherit
diff -Nru php8.2-8.2.29/.gitignore php8.2-8.2.30/.gitignore
--- php8.2-8.2.29/.gitignore	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/.gitignore	2025-12-16 17:18:12.000000000 +0000
@@ -169,6 +169,7 @@
 
 # Miscellaneous extensions files
 /ext/opcache/jit/zend_jit_x86.c
+/ext/opcache/jit/zend_jit_arm64.c
 /ext/opcache/minilua
 
 # Generated by `cd ext/name && phpize && ./configure`
diff -Nru php8.2-8.2.29/NEWS php8.2-8.2.30/NEWS
--- php8.2-8.2.29/NEWS	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/NEWS	2025-12-16 17:18:12.000000000 +0000
@@ -1,5 +1,27 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+18 Dec 2025, PHP 8.2.30
+
+- Curl:
+  . Fix curl build and test failures with version 8.16.
+    (nielsdos, ilutov, Jakub Zelenka)
+
+- Opcache:
+  . Reset global pointers to prevent use-after-free in zend_jit_status().
+    (Florian Engelhardt)
+
+- PDO:
+  . Fixed GHSA-8xr5-qppj-gvwj (PDO quoting result null deref). (CVE-2025-14180)
+    (Jakub Zelenka)
+
+- Standard:
+  . Fixed GHSA-www2-q4fc-65wf (Null byte termination in dns_get_record()).
+    (ndossche)
+  . Fixed GHSA-h96m-rvf9-jgm2 (Heap buffer overflow in array_merge()).
+    (CVE-2025-14178) (ndossche)
+  . Fixed GHSA-3237-qqm7-mfv7 (Information Leak of Memory in getimagesize).
+    (CVE-2025-14177) (ndossche)
+
 03 Jul 2025, PHP 8.2.29
 
 - PGSQL:
diff -Nru php8.2-8.2.29/Zend/tests/concat_003.phpt php8.2-8.2.30/Zend/tests/concat_003.phpt
--- php8.2-8.2.29/Zend/tests/concat_003.phpt	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/Zend/tests/concat_003.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -11,7 +11,7 @@
 $time = microtime(TRUE);
 
 /* This might vary on Linux/Windows, so the worst case and also count in slow machines. */
-$t_max = 1.0;
+$t_max = 2.0;
 
 $datas = array_fill(0, 220000, [
     '000.000.000.000',
diff -Nru php8.2-8.2.29/Zend/zend.h php8.2-8.2.30/Zend/zend.h
--- php8.2-8.2.29/Zend/zend.h	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/Zend/zend.h	2025-12-16 17:18:12.000000000 +0000
@@ -20,7 +20,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "4.2.29"
+#define ZEND_VERSION "4.2.30"
 
 #define ZEND_ENGINE_3
 
diff -Nru php8.2-8.2.29/Zend/zend_ini_parser.c php8.2-8.2.30/Zend/zend_ini_parser.c
--- php8.2-8.2.29/Zend/zend_ini_parser.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/Zend/zend_ini_parser.c	2025-12-16 17:18:12.000000000 +0000
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.8.2.  */
+/* A Bison parser, made by GNU Bison 3.7.5.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -46,10 +46,10 @@
    USER NAME SPACE" below.  */
 
 /* Identify Bison output, and Bison version.  */
-#define YYBISON 30802
+#define YYBISON 30705
 
 /* Bison version string.  */
-#define YYBISON_VERSION "3.8.2"
+#define YYBISON_VERSION "3.7.5"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -595,18 +595,12 @@
 # define YY_USE(E) /* empty */
 #endif
 
+#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__
-# if __GNUC__ * 100 + __GNUC_MINOR__ < 407
-#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
-    _Pragma ("GCC diagnostic push")                                     \
-    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")
-# else
-#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                            \
     _Pragma ("GCC diagnostic push")                                     \
     _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")              \
     _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# endif
 # define YY_IGNORE_MAYBE_UNINITIALIZED_END      \
     _Pragma ("GCC diagnostic pop")
 #else
@@ -822,7 +816,7 @@
 };
 
 #if INI_DEBUG
-/* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_int16 yyrline[] =
 {
        0,   315,   315,   316,   320,   327,   338,   347,   348,   352,
@@ -865,6 +859,19 @@
 }
 #endif
 
+#ifdef YYPRINT
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
+static const yytype_int16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,    61,    58,
+      44,    46,    34,    39,    94,    43,    45,    47,    42,    37,
+      36,   126,    60,    62,    63,    64,   123,   125,   124,    38,
+      33,    93,    40,    41
+};
+#endif
+
 #define YYPACT_NINF (-25)
 
 #define yypact_value_is_default(Yyn) \
@@ -875,8 +882,8 @@
 #define yytable_value_is_error(Yyn) \
   0
 
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
 static const yytype_int8 yypact[] =
 {
      -25,     9,   -25,    73,   -17,    81,   -25,   -25,   -25,   -25,
@@ -889,9 +896,9 @@
      -25,   -25
 };
 
-/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
-   Performed when YYTABLE does not specify something else to do.  Zero
-   means the default is an error.  */
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
 static const yytype_int8 yydefact[] =
 {
        3,     0,     1,    10,     7,    17,     8,     2,    42,    41,
@@ -904,23 +911,23 @@
        6,    32
 };
 
-/* YYPGOTO[NTERM-NUM].  */
+  /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
      -25,   -25,   -25,   -25,    -9,   -25,   -23,   -25,    50,     4,
       -3,    44,   -24
 };
 
-/* YYDEFGOTO[NTERM-NUM].  */
+  /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int8 yydefgoto[] =
 {
        0,     1,     7,    15,    43,    26,    31,    16,    44,    45,
       28,    18,    29
 };
 
-/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule whose
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int8 yytable[] =
 {
       17,    19,    46,    50,    20,    21,    22,    23,    24,     2,
@@ -955,8 +962,8 @@
       -1,    -1,    22,    22
 };
 
-/* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of
-   state STATE-NUM.  */
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
 static const yytype_int8 yystos[] =
 {
        0,    45,     0,     3,     9,    10,    17,    46,     4,     5,
@@ -969,7 +976,7 @@
       48,    22
 };
 
-/* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM.  */
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_int8 yyr1[] =
 {
        0,    44,    45,    45,    46,    46,    46,    46,    46,    47,
@@ -980,7 +987,7 @@
       56
 };
 
-/* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM.  */
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
 static const yytype_int8 yyr2[] =
 {
        0,     2,     2,     0,     3,     3,     5,     1,     1,     1,
@@ -1000,7 +1007,6 @@
 #define YYACCEPT        goto yyacceptlab
 #define YYABORT         goto yyabortlab
 #define YYERROR         goto yyerrorlab
-#define YYNOMEM         goto yyexhaustedlab
 
 
 #define YYRECOVERING()  (!!yyerrstatus)
@@ -1041,7 +1047,10 @@
     YYFPRINTF Args;                             \
 } while (0)
 
-
+/* This macro is provided for backward compatibility. */
+# ifndef YY_LOCATION_PRINT
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 
 
 # define YY_SYMBOL_PRINT(Title, Kind, Value, Location)                    \
@@ -1068,6 +1077,10 @@
   YY_USE (yyoutput);
   if (!yyvaluep)
     return;
+# ifdef YYPRINT
+  if (yykind < YYNTOKENS)
+    YYPRINT (yyo, yytoknum[yykind], *yyvaluep);
+# endif
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   YY_USE (yykind);
   YY_IGNORE_MAYBE_UNINITIALIZED_END
@@ -1616,7 +1629,6 @@
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yychar = INI_EMPTY; /* Cause a token to be read.  */
-
   goto yysetstate;
 
 
@@ -1642,7 +1654,7 @@
 
   if (yyss + yystacksize - 1 <= yyssp)
 #if !defined yyoverflow && !defined YYSTACK_RELOCATE
-    YYNOMEM;
+    goto yyexhaustedlab;
 #else
     {
       /* Get the current used size of the three stacks, in elements.  */
@@ -1670,7 +1682,7 @@
 # else /* defined YYSTACK_RELOCATE */
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-        YYNOMEM;
+        goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
         yystacksize = YYMAXDEPTH;
@@ -1681,7 +1693,7 @@
           YY_CAST (union yyalloc *,
                    YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize))));
         if (! yyptr)
-          YYNOMEM;
+          goto yyexhaustedlab;
         YYSTACK_RELOCATE (yyss_alloc, yyss);
         YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
@@ -1703,7 +1715,6 @@
     }
 #endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
 
-
   if (yystate == YYFINAL)
     YYACCEPT;
 
@@ -2103,7 +2114,7 @@
           }
         yyerror (yymsgp);
         if (yysyntax_error_status == YYENOMEM)
-          YYNOMEM;
+          goto yyexhaustedlab;
       }
     }
 
@@ -2139,7 +2150,6 @@
      label yyerrorlab therefore never appears in user code.  */
   if (0)
     YYERROR;
-  ++yynerrs;
 
   /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
@@ -2200,7 +2210,7 @@
 `-------------------------------------*/
 yyacceptlab:
   yyresult = 0;
-  goto yyreturnlab;
+  goto yyreturn;
 
 
 /*-----------------------------------.
@@ -2208,22 +2218,24 @@
 `-----------------------------------*/
 yyabortlab:
   yyresult = 1;
-  goto yyreturnlab;
+  goto yyreturn;
 
 
-/*-----------------------------------------------------------.
-| yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here.  |
-`-----------------------------------------------------------*/
+#if 1
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
 yyexhaustedlab:
   yyerror (YY_("memory exhausted"));
   yyresult = 2;
-  goto yyreturnlab;
+  goto yyreturn;
+#endif
 
 
-/*----------------------------------------------------------.
-| yyreturnlab -- parsing is finished, clean up and return.  |
-`----------------------------------------------------------*/
-yyreturnlab:
+/*-------------------------------------------------------.
+| yyreturn -- parsing is finished, clean up and return.  |
+`-------------------------------------------------------*/
+yyreturn:
   if (yychar != INI_EMPTY)
     {
       /* Make sure we have latest lookahead translation.  See comments at
diff -Nru php8.2-8.2.29/Zend/zend_ini_parser.h php8.2-8.2.30/Zend/zend_ini_parser.h
--- php8.2-8.2.29/Zend/zend_ini_parser.h	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/Zend/zend_ini_parser.h	2025-12-16 17:18:12.000000000 +0000
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.8.2.  */
+/* A Bison parser, made by GNU Bison 3.7.5.  */
 
 /* Bison interface for Yacc-like parsers in C
 
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -90,8 +90,6 @@
 
 
 
-
 int ini_parse (void);
 
-
 #endif /* !YY_INI_ZEND_ZEND_INI_PARSER_H_INCLUDED  */
diff -Nru php8.2-8.2.29/Zend/zend_ini_parser.output php8.2-8.2.30/Zend/zend_ini_parser.output
--- php8.2-8.2.29/Zend/zend_ini_parser.output	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/Zend/zend_ini_parser.output	2025-12-16 17:18:12.000000000 +0000
@@ -22,7 +22,7 @@
     0 $accept: statement_list "end of file"
 
     1 statement_list: statement_list statement
-    2               | ε
+    2               | %empty
 
     3 statement: TC_SECTION section_string_or_value ']'
     4          | TC_LABEL '=' string_or_value
@@ -31,7 +31,7 @@
     7          | END_OF_LINE
 
     8 section_string_or_value: var_string_list_section
-    9                        | ε
+    9                        | %empty
 
    10 string_or_value: expr
    11                | BOOL_TRUE
@@ -40,11 +40,11 @@
    14                | END_OF_LINE
 
    15 option_offset: var_string_list
-   16              | ε
+   16              | %empty
 
    17 encapsed_list: encapsed_list cfg_var_ref
    18              | encapsed_list TC_QUOTED_STRING
-   19              | ε
+   19              | %empty
 
    20 var_string_list_section: cfg_var_ref
    21                        | constant_literal
diff -Nru php8.2-8.2.29/Zend/zend_ini_scanner.c php8.2-8.2.30/Zend/zend_ini_scanner.c
--- php8.2-8.2.29/Zend/zend_ini_scanner.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/Zend/zend_ini_scanner.c	2025-12-16 17:18:12.000000000 +0000
@@ -1,4 +1,4 @@
-/* Generated by re2c 4.0 */
+/* Generated by re2c 2.0.3 */
 /*
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
@@ -379,305 +379,82 @@
 {
 	YYCTYPE yych;
 	unsigned int yyaccept = 0;
-	static const unsigned char yybm_INITIAL[256] = {
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 160,   0, 144, 144,   0, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		240, 128, 128, 144, 128, 144, 128, 144,
-		128, 128, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 128, 144, 128, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 128, 144, 144, 128, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 128, 128, 128, 128, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144,
-		144, 144, 144, 144, 144, 144, 144, 144
-	};
-	static const unsigned char yybm_ST_OFFSET[256] = {
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 140, 128, 132, 132, 128, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		140, 132, 128, 132, 192, 132, 132,   0,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		180, 180, 180, 180, 180, 180, 180, 180,
-		180, 180, 132, 128, 132, 132, 132, 132,
-		132, 164, 164, 164, 164, 164, 164, 164,
-		164, 164, 164, 164, 164, 164, 164, 164,
-		164, 164, 164, 164, 164, 164, 164, 164,
-		164, 164, 164, 132, 192, 128, 132, 164,
-		132, 164, 164, 164, 164, 164, 164, 164,
-		164, 164, 164, 164, 164, 164, 164, 164,
-		164, 164, 164, 164, 164, 164, 164, 164,
-		164, 164, 164, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132
-	};
-	static const unsigned char yybm_ST_SECTION_VALUE[256] = {
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 140, 128, 132, 132, 128, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		140, 132, 128, 132, 192, 132, 132,   0,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		180, 180, 180, 180, 180, 180, 180, 180,
-		180, 180, 132, 128, 132, 132, 132, 132,
-		132, 164, 164, 164, 164, 164, 164, 164,
-		164, 164, 164, 164, 164, 164, 164, 164,
-		164, 164, 164, 164, 164, 164, 164, 164,
-		164, 164, 164, 132, 192, 128, 132, 164,
-		132, 164, 164, 164, 164, 164, 164, 164,
-		164, 164, 164, 164, 164, 164, 164, 164,
-		164, 164, 164, 164, 164, 164, 164, 164,
-		164, 164, 164, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132,
-		132, 132, 132, 132, 132, 132, 132, 132
-	};
-	static const unsigned char yybm_ST_VALUE[256] = {
-		 80,  82,  82,  82,  82,  82,  82,  82,
-		 82,  84,  64,  82,  82,  64,  82,  82,
-		 82,  82,  82,  82,  82,  82,  82,  82,
-		 82,  82,  82,  82,  82,  82,  82,  82,
-		 84,  80,  80,  82, 208,  82,  80,  16,
-		 80,  80,  82,  82,  82,  82,  82,  82,
-		122, 122, 122, 122, 122, 122, 122, 122,
-		122, 122,  82,  80,  82,  80,  82,  82,
-		 82, 114, 114, 114, 114, 114, 114, 114,
-		114, 114, 114, 114, 114, 114, 114, 114,
-		114, 114, 114, 114, 114, 114, 114, 114,
-		114, 114, 114,  82,  82,  82,  80, 114,
-		 82, 114, 114, 114, 114, 114, 114, 114,
-		114, 114, 114, 114, 114, 114, 114, 114,
-		114, 114, 114, 114, 114, 114, 114, 114,
-		114, 114, 114,  82,  80,  82,  80,  82,
-		 82,  82,  82,  82,  82,  82,  82,  82,
-		 82,  82,  82,  82,  82,  82,  82,  82,
-		 82,  82,  82,  82,  82,  82,  82,  82,
-		 82,  82,  82,  82,  82,  82,  82,  82,
-		 82,  82,  82,  82,  82,  82,  82,  82,
-		 82,  82,  82,  82,  82,  82,  82,  82,
-		 82,  82,  82,  82,  82,  82,  82,  82,
-		 82,  82,  82,  82,  82,  82,  82,  82,
-		 82,  82,  82,  82,  82,  82,  82,  82,
-		 82,  82,  82,  82,  82,  82,  82,  82,
-		 82,  82,  82,  82,  82,  82,  82,  82,
-		 82,  82,  82,  82,  82,  82,  82,  82,
-		 82,  82,  82,  82,  82,  82,  82,  82,
-		 82,  82,  82,  82,  82,  82,  82,  82,
-		 82,  82,  82,  82,  82,  82,  82,  82,
-		 82,  82,  82,  82,  82,  82,  82,  82
-	};
-	static const unsigned char yybm_ST_SECTION_RAW[256] = {
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64, 192,   0,  64,  64,   0,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		192,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,   0,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64
-	};
-	static const unsigned char yybm_ST_DOUBLE_QUOTES[256] = {
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0, 128,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		128,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0
-	};
-	static const unsigned char yybm_ST_VARNAME[256] = {
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128,   0,   0, 128, 128,   0, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128,   0,   0, 128,   0, 128,   0, 128,
-		  0,   0, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128,   0, 128,   0, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128,   0, 128, 128,   0, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128,   0,   0,   0,   0, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128
-	};
-	static const unsigned char yybm_ST_RAW[256] = {
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64, 192,   0,  64,  64,   0,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		192,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64
-	};
 	if (YYGETCONDITION() < 4) {
 		if (YYGETCONDITION() < 2) {
-			if (YYGETCONDITION() < 1) goto yyc_INITIAL;
-			else goto yyc_ST_OFFSET;
+			if (YYGETCONDITION() < 1) {
+				goto yyc_INITIAL;
+			} else {
+				goto yyc_ST_OFFSET;
+			}
 		} else {
-			if (YYGETCONDITION() < 3) goto yyc_ST_SECTION_VALUE;
-			else goto yyc_ST_VALUE;
+			if (YYGETCONDITION() < 3) {
+				goto yyc_ST_SECTION_VALUE;
+			} else {
+				goto yyc_ST_VALUE;
+			}
 		}
 	} else {
 		if (YYGETCONDITION() < 6) {
-			if (YYGETCONDITION() < 5) goto yyc_ST_SECTION_RAW;
-			else goto yyc_ST_DOUBLE_QUOTES;
+			if (YYGETCONDITION() < 5) {
+				goto yyc_ST_SECTION_RAW;
+			} else {
+				goto yyc_ST_DOUBLE_QUOTES;
+			}
 		} else {
-			if (YYGETCONDITION() < 7) goto yyc_ST_VARNAME;
-			else goto yyc_ST_RAW;
+			if (YYGETCONDITION() < 7) {
+				goto yyc_ST_VARNAME;
+			} else {
+				goto yyc_ST_RAW;
+			}
 		}
 	}
 /* *********************************** */
 yyc_INITIAL:
-	YYFILL(5);
-	yych = *YYCURSOR;
-	YYDEBUG(0, yych);
-	if (yybm_INITIAL[0+yych] & 64) goto yy9;
-	switch (yych) {
-		case '\t': goto yy4;
-		case '\n': goto yy6;
-		case '\r': goto yy8;
+	{
+		static const unsigned char yybm[] = {
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 160,   0, 144, 144,   0, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			240, 128, 128, 144, 128, 144, 128, 144, 
+			128, 128, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 128, 144, 128, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 128, 144, 144, 128, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 128, 128, 128, 128, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+			144, 144, 144, 144, 144, 144, 144, 144, 
+		};
+		YYDEBUG(0, *YYCURSOR);
+		YYFILL(5);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 64) {
+			goto yy11;
+		}
+		switch (yych) {
+		case '\t':	goto yy5;
+		case '\n':	goto yy8;
+		case '\r':	goto yy10;
 		case ' ':
 		case '!':
 		case '"':
@@ -689,36 +466,38 @@
 		case '{':
 		case '|':
 		case '}':
-		case '~': goto yy10;
-		case ';': goto yy11;
-		case '=': goto yy12;
+		case '~':	goto yy13;
+		case ';':	goto yy15;
+		case '=':	goto yy17;
 		case 'F':
-		case 'f': goto yy13;
+		case 'f':	goto yy20;
 		case 'N':
-		case 'n': goto yy14;
+		case 'n':	goto yy21;
 		case 'O':
-		case 'o': goto yy15;
+		case 'o':	goto yy22;
 		case 'T':
-		case 't': goto yy16;
+		case 't':	goto yy23;
 		case 'Y':
-		case 'y': goto yy17;
-		case '[': goto yy18;
-		default: goto yy1;
-	}
-yy1:
-	YYDEBUG(1, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
+		case 'y':	goto yy24;
+		case '[':	goto yy25;
+		default:	goto yy2;
+		}
 yy2:
-	YYDEBUG(2, yych);
-	if (yybm_INITIAL[0+yych] & 16) goto yy1;
-	if (yych <= '=') goto yy3;
-	if (yych <= '[') goto yy19;
+		YYDEBUG(2, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 yy3:
-	YYDEBUG(3, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Get option name */
+		YYDEBUG(3, *YYCURSOR);
+		if (yybm[0+yych] & 16) {
+			goto yy2;
+		}
+		if (yych <= '=') goto yy4;
+		if (yych <= '[') goto yy27;
+yy4:
+		YYDEBUG(4, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Get option name */
 	/* Eat leading whitespace */
 	EAT_LEADING_WHITESPACE();
 
@@ -727,116 +506,128 @@
 
 	RETURN_TOKEN(TC_LABEL, yytext, yyleng);
 }
-yy4:
-	YYDEBUG(4, yych);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yybm_INITIAL[0+yych] & 32) goto yy4;
-	if (yych <= '\r') {
-		if (yych <= 0x08) goto yy5;
-		if (yych <= '\n') goto yy6;
-		if (yych >= '\r') goto yy8;
-	} else {
-		if (yych <= ';') {
-			if (yych >= ';') goto yy11;
+yy5:
+		YYDEBUG(5, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(6, *YYCURSOR);
+		if (yybm[0+yych] & 32) {
+			goto yy5;
+		}
+		if (yych <= '\r') {
+			if (yych <= 0x08) goto yy7;
+			if (yych <= '\n') goto yy8;
+			if (yych >= '\r') goto yy10;
 		} else {
-			if (yych == '=') goto yy12;
+			if (yych <= ';') {
+				if (yych >= ';') goto yy15;
+			} else {
+				if (yych == '=') goto yy17;
+			}
 		}
-	}
-yy5:
-	YYDEBUG(5, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy7:
+		YYDEBUG(7, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	/* eat whitespace */
 	goto restart;
 }
-yy6:
-	YYDEBUG(6, yych);
-	++YYCURSOR;
-yy7:
-	YYDEBUG(7, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy8:
+		YYDEBUG(8, *YYCURSOR);
+		++YYCURSOR;
+yy9:
+		YYDEBUG(9, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-yy8:
-	YYDEBUG(8, yych);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy6;
-	goto yy7;
-yy9:
-	YYDEBUG(9, yych);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yybm_INITIAL[0+yych] & 64) goto yy9;
-	if (yych <= '\'') {
-		if (yych <= 0x1F) {
-			if (yych <= '\n') {
-				if (yych <= 0x08) goto yy1;
-				if (yych <= '\t') goto yy4;
-				goto yy6;
-			} else {
-				if (yych == '\r') goto yy8;
-				goto yy1;
-			}
-		} else {
-			if (yych <= '$') {
-				if (yych == '#') goto yy1;
-				goto yy3;
-			} else {
-				if (yych == '&') goto yy3;
-				goto yy1;
-			}
-		}
-	} else {
-		if (yych <= 'Z') {
-			if (yych <= ';') {
-				if (yych <= ')') goto yy3;
-				if (yych <= ':') goto yy1;
-				goto yy11;
+yy10:
+		YYDEBUG(10, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy8;
+		goto yy9;
+yy11:
+		YYDEBUG(11, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(12, *YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy11;
+		}
+		if (yych <= '\'') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x08) goto yy2;
+					if (yych <= '\t') goto yy5;
+					goto yy8;
+				} else {
+					if (yych == '\r') goto yy10;
+					goto yy2;
+				}
 			} else {
-				if (yych == '=') goto yy12;
-				goto yy1;
+				if (yych <= '$') {
+					if (yych == '#') goto yy2;
+					goto yy4;
+				} else {
+					if (yych == '&') goto yy4;
+					goto yy2;
+				}
 			}
 		} else {
-			if (yych <= '^') {
-				if (yych <= '[') goto yy19;
-				if (yych <= ']') goto yy1;
-				goto yy3;
+			if (yych <= 'Z') {
+				if (yych <= ';') {
+					if (yych <= ')') goto yy4;
+					if (yych <= ':') goto yy2;
+					goto yy15;
+				} else {
+					if (yych == '=') goto yy17;
+					goto yy2;
+				}
 			} else {
-				if (yych <= 'z') goto yy1;
-				if (yych <= '~') goto yy3;
-				goto yy1;
+				if (yych <= '^') {
+					if (yych <= '[') goto yy27;
+					if (yych <= ']') goto yy2;
+					goto yy4;
+				} else {
+					if (yych <= 'z') goto yy2;
+					if (yych <= '~') goto yy4;
+					goto yy2;
+				}
 			}
 		}
-	}
-yy10:
-	YYDEBUG(10, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Disallow these chars outside option values */
+yy13:
+		YYDEBUG(13, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(14, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Disallow these chars outside option values */
 	return yytext[0];
 }
-yy11:
-	YYDEBUG(11, yych);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yybm_INITIAL[0+yych] & 128) goto yy11;
-	if (yych <= '\n') goto yy20;
-	goto yy22;
-yy12:
-	YYDEBUG(12, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '\t') goto yy12;
-	if (yych == ' ') goto yy12;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Start option value */
+yy15:
+		YYDEBUG(15, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(16, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy15;
+		}
+		if (yych <= '\n') goto yy30;
+		goto yy32;
+yy17:
+		YYDEBUG(17, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(18, *YYCURSOR);
+		if (yych == '\t') goto yy17;
+		if (yych == ' ') goto yy17;
+		YYDEBUG(19, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Start option value */
 	if (SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW) {
 		BEGIN(ST_RAW);
 	} else {
@@ -844,61 +635,62 @@
 	}
 	return '=';
 }
-yy13:
-	YYDEBUG(13, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy23;
-	if (yych == 'a') goto yy23;
-	goto yy2;
-yy14:
-	YYDEBUG(14, yych);
-	yych = *++YYCURSOR;
-	if (yych <= 'U') {
-		if (yych == 'O') goto yy24;
-		if (yych <= 'T') goto yy2;
-		goto yy26;
-	} else {
-		if (yych <= 'o') {
-			if (yych <= 'n') goto yy2;
-			goto yy24;
-		} else {
-			if (yych == 'u') goto yy26;
-			goto yy2;
+yy20:
+		YYDEBUG(20, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'A') goto yy33;
+		if (yych == 'a') goto yy33;
+		goto yy3;
+yy21:
+		YYDEBUG(21, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= 'U') {
+			if (yych == 'O') goto yy34;
+			if (yych <= 'T') goto yy3;
+			goto yy36;
+		} else {
+			if (yych <= 'o') {
+				if (yych <= 'n') goto yy3;
+				goto yy34;
+			} else {
+				if (yych == 'u') goto yy36;
+				goto yy3;
+			}
 		}
-	}
-yy15:
-	YYDEBUG(15, yych);
-	yych = *++YYCURSOR;
-	if (yych <= 'N') {
-		if (yych == 'F') goto yy27;
-		if (yych <= 'M') goto yy2;
-		goto yy28;
-	} else {
-		if (yych <= 'f') {
-			if (yych <= 'e') goto yy2;
-			goto yy27;
-		} else {
-			if (yych == 'n') goto yy28;
-			goto yy2;
+yy22:
+		YYDEBUG(22, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= 'N') {
+			if (yych == 'F') goto yy37;
+			if (yych <= 'M') goto yy3;
+			goto yy38;
+		} else {
+			if (yych <= 'f') {
+				if (yych <= 'e') goto yy3;
+				goto yy37;
+			} else {
+				if (yych == 'n') goto yy38;
+				goto yy3;
+			}
 		}
-	}
-yy16:
-	YYDEBUG(16, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy30;
-	if (yych == 'r') goto yy30;
-	goto yy2;
-yy17:
-	YYDEBUG(17, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy31;
-	if (yych == 'e') goto yy31;
-	goto yy2;
-yy18:
-	YYDEBUG(18, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Section start */
+yy23:
+		YYDEBUG(23, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'R') goto yy41;
+		if (yych == 'r') goto yy41;
+		goto yy3;
+yy24:
+		YYDEBUG(24, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy42;
+		if (yych == 'e') goto yy42;
+		goto yy3;
+yy25:
+		YYDEBUG(25, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(26, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Section start */
 	/* Enter section data lookup state */
 	if (SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW) {
 		BEGIN(ST_SECTION_RAW);
@@ -907,15 +699,17 @@
 	}
 	return TC_SECTION;
 }
-yy19:
-	YYDEBUG(19, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '\t') goto yy19;
-	if (yych == ' ') goto yy19;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Start of option with offset */
+yy27:
+		YYDEBUG(27, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(28, *YYCURSOR);
+		if (yych == '\t') goto yy27;
+		if (yych == ' ') goto yy27;
+		YYDEBUG(29, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Start of option with offset */
 	/* Eat leading whitespace */
 	EAT_LEADING_WHITESPACE();
 
@@ -927,586 +721,658 @@
 
 	RETURN_TOKEN(TC_OFFSET, yytext, yyleng);
 }
-yy20:
-	YYDEBUG(20, yych);
-	++YYCURSOR;
-yy21:
-	YYDEBUG(21, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Comment */
+yy30:
+		YYDEBUG(30, *YYCURSOR);
+		++YYCURSOR;
+yy31:
+		YYDEBUG(31, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Comment */
 	BEGIN(INITIAL);
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-yy22:
-	YYDEBUG(22, yych);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy20;
-	goto yy21;
-yy23:
-	YYDEBUG(23, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy32;
-	if (yych == 'l') goto yy32;
-	goto yy2;
-yy24:
-	YYDEBUG(24, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '\'') {
-		if (yych <= 0x1F) {
-			if (yych <= '\n') {
-				if (yych <= 0x08) goto yy2;
-				if (yych <= '\t') goto yy33;
-			} else {
-				if (yych != '\r') goto yy2;
-			}
-		} else {
-			if (yych <= '#') {
-				if (yych <= ' ') goto yy34;
-				if (yych >= '#') goto yy2;
-			} else {
-				if (yych == '%') goto yy2;
-				if (yych >= '\'') goto yy2;
-			}
-		}
-	} else {
-		if (yych <= 'N') {
-			if (yych <= ';') {
-				if (yych <= ')') goto yy25;
-				if (yych <= ':') goto yy2;
+yy32:
+		YYDEBUG(32, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy30;
+		goto yy31;
+yy33:
+		YYDEBUG(33, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'L') goto yy43;
+		if (yych == 'l') goto yy43;
+		goto yy3;
+yy34:
+		YYDEBUG(34, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\'') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x08) goto yy3;
+					if (yych <= '\t') goto yy44;
+				} else {
+					if (yych != '\r') goto yy3;
+				}
 			} else {
-				if (yych == '=') goto yy25;
-				if (yych <= 'M') goto yy2;
-				goto yy35;
+				if (yych <= '#') {
+					if (yych <= ' ') goto yy46;
+					if (yych >= '#') goto yy3;
+				} else {
+					if (yych == '%') goto yy3;
+					if (yych >= '\'') goto yy3;
+				}
 			}
 		} else {
-			if (yych <= 'm') {
-				if (yych != '^') goto yy2;
+			if (yych <= 'N') {
+				if (yych <= ';') {
+					if (yych <= ')') goto yy35;
+					if (yych <= ':') goto yy3;
+				} else {
+					if (yych == '=') goto yy35;
+					if (yych <= 'M') goto yy3;
+					goto yy48;
+				}
 			} else {
-				if (yych <= 'n') goto yy35;
-				if (yych <= 'z') goto yy2;
-				if (yych >= 0x7F) goto yy2;
+				if (yych <= 'm') {
+					if (yych != '^') goto yy3;
+				} else {
+					if (yych <= 'n') goto yy48;
+					if (yych <= 'z') goto yy3;
+					if (yych >= 0x7F) goto yy3;
+				}
 			}
 		}
-	}
-yy25:
-	YYDEBUG(25, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* FALSE value (when used outside option value/offset this causes parse error!)*/
+yy35:
+		YYDEBUG(35, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* FALSE value (when used outside option value/offset this causes parse error!)*/
 	RETURN_TOKEN(BOOL_FALSE, "", 0);
 }
-yy26:
-	YYDEBUG(26, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy36;
-	if (yych == 'l') goto yy36;
-	goto yy2;
-yy27:
-	YYDEBUG(27, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'F') goto yy34;
-	if (yych == 'f') goto yy34;
-	goto yy2;
-yy28:
-	YYDEBUG(28, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '&') {
-		if (yych <= 0x1F) {
-			if (yych <= '\n') {
-				if (yych <= 0x08) goto yy1;
-				if (yych <= '\t') goto yy37;
-			} else {
-				if (yych != '\r') goto yy1;
-			}
-		} else {
-			if (yych <= '#') {
-				if (yych <= ' ') goto yy28;
-				if (yych >= '#') goto yy1;
-			} else {
-				if (yych == '%') goto yy1;
-			}
-		}
-	} else {
-		if (yych <= '=') {
-			if (yych <= ':') {
-				if (yych <= '\'') goto yy1;
-				if (yych >= '*') goto yy1;
+yy36:
+		YYDEBUG(36, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'L') goto yy49;
+		if (yych == 'l') goto yy49;
+		goto yy3;
+yy37:
+		YYDEBUG(37, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'F') goto yy46;
+		if (yych == 'f') goto yy46;
+		goto yy3;
+yy38:
+		YYDEBUG(38, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(39, *YYCURSOR);
+		if (yych <= '&') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x08) goto yy2;
+					if (yych <= '\t') goto yy50;
+				} else {
+					if (yych != '\r') goto yy2;
+				}
 			} else {
-				if (yych == '<') goto yy1;
+				if (yych <= '#') {
+					if (yych <= ' ') goto yy38;
+					if (yych >= '#') goto yy2;
+				} else {
+					if (yych == '%') goto yy2;
+				}
 			}
 		} else {
-			if (yych <= ']') {
-				if (yych == '[') goto yy19;
-				goto yy1;
+			if (yych <= '=') {
+				if (yych <= ':') {
+					if (yych <= '\'') goto yy2;
+					if (yych >= '*') goto yy2;
+				} else {
+					if (yych == '<') goto yy2;
+				}
 			} else {
-				if (yych <= '^') goto yy29;
-				if (yych <= 'z') goto yy1;
-				if (yych >= 0x7F) goto yy1;
+				if (yych <= ']') {
+					if (yych == '[') goto yy27;
+					goto yy2;
+				} else {
+					if (yych <= '^') goto yy40;
+					if (yych <= 'z') goto yy2;
+					if (yych >= 0x7F) goto yy2;
+				}
 			}
 		}
-	}
-yy29:
-	YYDEBUG(29, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* TRUE value (when used outside option value/offset this causes parse error!) */
+yy40:
+		YYDEBUG(40, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* TRUE value (when used outside option value/offset this causes parse error!) */
 	RETURN_TOKEN(BOOL_TRUE, "1", 1);
 }
-yy30:
-	YYDEBUG(30, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'U') goto yy38;
-	if (yych == 'u') goto yy38;
-	goto yy2;
-yy31:
-	YYDEBUG(31, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy28;
-	if (yych == 's') goto yy28;
-	goto yy2;
-yy32:
-	YYDEBUG(32, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy35;
-	if (yych == 's') goto yy35;
-	goto yy2;
-yy33:
-	YYDEBUG(33, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '\t') goto yy33;
-	if (yych == ' ') goto yy33;
-	goto yy25;
-yy34:
-	YYDEBUG(34, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '&') {
-		if (yych <= 0x1F) {
-			if (yych <= '\n') {
-				if (yych <= 0x08) goto yy1;
-				if (yych <= '\t') goto yy33;
-				goto yy25;
-			} else {
-				if (yych == '\r') goto yy25;
-				goto yy1;
-			}
-		} else {
-			if (yych <= '#') {
-				if (yych <= ' ') goto yy34;
-				if (yych <= '"') goto yy25;
-				goto yy1;
-			} else {
-				if (yych == '%') goto yy1;
-				goto yy25;
-			}
-		}
-	} else {
-		if (yych <= '=') {
-			if (yych <= ':') {
-				if (yych <= '\'') goto yy1;
-				if (yych <= ')') goto yy25;
-				goto yy1;
+yy41:
+		YYDEBUG(41, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'U') goto yy52;
+		if (yych == 'u') goto yy52;
+		goto yy3;
+yy42:
+		YYDEBUG(42, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'S') goto yy38;
+		if (yych == 's') goto yy38;
+		goto yy3;
+yy43:
+		YYDEBUG(43, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'S') goto yy48;
+		if (yych == 's') goto yy48;
+		goto yy3;
+yy44:
+		YYDEBUG(44, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(45, *YYCURSOR);
+		if (yych == '\t') goto yy44;
+		if (yych == ' ') goto yy44;
+		goto yy35;
+yy46:
+		YYDEBUG(46, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(47, *YYCURSOR);
+		if (yych <= '&') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x08) goto yy2;
+					if (yych <= '\t') goto yy44;
+					goto yy35;
+				} else {
+					if (yych == '\r') goto yy35;
+					goto yy2;
+				}
 			} else {
-				if (yych == '<') goto yy1;
-				goto yy25;
+				if (yych <= '#') {
+					if (yych <= ' ') goto yy46;
+					if (yych <= '"') goto yy35;
+					goto yy2;
+				} else {
+					if (yych == '%') goto yy2;
+					goto yy35;
+				}
 			}
 		} else {
-			if (yych <= ']') {
-				if (yych == '[') goto yy19;
-				goto yy1;
-			} else {
-				if (yych <= '^') goto yy25;
-				if (yych <= 'z') goto yy1;
-				if (yych <= '~') goto yy25;
-				goto yy1;
-			}
-		}
-	}
-yy35:
-	YYDEBUG(35, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy34;
-	if (yych == 'e') goto yy34;
-	goto yy2;
-yy36:
-	YYDEBUG(36, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy39;
-	if (yych == 'l') goto yy39;
-	goto yy2;
-yy37:
-	YYDEBUG(37, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '\t') goto yy37;
-	if (yych == ' ') goto yy37;
-	goto yy29;
-yy38:
-	YYDEBUG(38, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy28;
-	if (yych == 'e') goto yy28;
-	goto yy2;
-yy39:
-	YYDEBUG(39, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '&') {
-		if (yych <= 0x1F) {
-			if (yych <= '\n') {
-				if (yych <= 0x08) goto yy1;
-				if (yych <= '\t') goto yy41;
-			} else {
-				if (yych != '\r') goto yy1;
-			}
-		} else {
-			if (yych <= '#') {
-				if (yych <= ' ') goto yy39;
-				if (yych >= '#') goto yy1;
+			if (yych <= '=') {
+				if (yych <= ':') {
+					if (yych <= '\'') goto yy2;
+					if (yych <= ')') goto yy35;
+					goto yy2;
+				} else {
+					if (yych == '<') goto yy2;
+					goto yy35;
+				}
 			} else {
-				if (yych == '%') goto yy1;
+				if (yych <= ']') {
+					if (yych == '[') goto yy27;
+					goto yy2;
+				} else {
+					if (yych <= '^') goto yy35;
+					if (yych <= 'z') goto yy2;
+					if (yych <= '~') goto yy35;
+					goto yy2;
+				}
 			}
 		}
-	} else {
-		if (yych <= '=') {
-			if (yych <= ':') {
-				if (yych <= '\'') goto yy1;
-				if (yych >= '*') goto yy1;
+yy48:
+		YYDEBUG(48, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy46;
+		if (yych == 'e') goto yy46;
+		goto yy3;
+yy49:
+		YYDEBUG(49, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'L') goto yy53;
+		if (yych == 'l') goto yy53;
+		goto yy3;
+yy50:
+		YYDEBUG(50, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(51, *YYCURSOR);
+		if (yych == '\t') goto yy50;
+		if (yych == ' ') goto yy50;
+		goto yy40;
+yy52:
+		YYDEBUG(52, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy38;
+		if (yych == 'e') goto yy38;
+		goto yy3;
+yy53:
+		YYDEBUG(53, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(54, *YYCURSOR);
+		if (yych <= '&') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x08) goto yy2;
+					if (yych <= '\t') goto yy56;
+				} else {
+					if (yych != '\r') goto yy2;
+				}
 			} else {
-				if (yych == '<') goto yy1;
+				if (yych <= '#') {
+					if (yych <= ' ') goto yy53;
+					if (yych >= '#') goto yy2;
+				} else {
+					if (yych == '%') goto yy2;
+				}
 			}
 		} else {
-			if (yych <= ']') {
-				if (yych == '[') goto yy19;
-				goto yy1;
+			if (yych <= '=') {
+				if (yych <= ':') {
+					if (yych <= '\'') goto yy2;
+					if (yych >= '*') goto yy2;
+				} else {
+					if (yych == '<') goto yy2;
+				}
 			} else {
-				if (yych <= '^') goto yy40;
-				if (yych <= 'z') goto yy1;
-				if (yych >= 0x7F) goto yy1;
+				if (yych <= ']') {
+					if (yych == '[') goto yy27;
+					goto yy2;
+				} else {
+					if (yych <= '^') goto yy55;
+					if (yych <= 'z') goto yy2;
+					if (yych >= 0x7F) goto yy2;
+				}
 			}
 		}
-	}
-yy40:
-	YYDEBUG(40, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy55:
+		YYDEBUG(55, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(NULL_NULL, "", 0);
 }
-yy41:
-	YYDEBUG(41, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '\t') goto yy41;
-	if (yych == ' ') goto yy41;
-	goto yy40;
+yy56:
+		YYDEBUG(56, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(57, *YYCURSOR);
+		if (yych == '\t') goto yy56;
+		if (yych == ' ') goto yy56;
+		goto yy55;
+	}
 /* *********************************** */
 yyc_ST_OFFSET:
-	YYFILL(2);
-	yych = *YYCURSOR;
-	YYDEBUG(42, yych);
-	if (yybm_ST_OFFSET[0+yych] & 8) goto yy46;
-	if (yych <= '/') {
-		if (yych <= '"') {
-			if (yych <= '\f') {
-				if (yych <= 0x08) goto yy43;
-				if (yych <= '\n') goto yy47;
-			} else {
-				if (yych <= '\r') goto yy47;
-				if (yych >= '"') goto yy49;
-			}
-		} else {
-			if (yych <= '&') {
-				if (yych == '$') goto yy50;
-			} else {
-				if (yych <= '\'') goto yy51;
-				if (yych <= ',') goto yy43;
-				if (yych <= '.') goto yy52;
-			}
+	{
+		static const unsigned char yybm[] = {
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 140, 128, 132, 132, 128, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			140, 132, 128, 132, 192, 132, 132,   0, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			180, 180, 180, 180, 180, 180, 180, 180, 
+			180, 180, 132, 128, 132, 132, 132, 132, 
+			132, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 132, 192, 128, 132, 164, 
+			132, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+		};
+		YYDEBUG(58, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 8) {
+			goto yy63;
 		}
-	} else {
-		if (yych <= '[') {
-			if (yych <= ';') {
-				if (yych <= '9') goto yy53;
-				if (yych >= ';') goto yy47;
+		if (yych <= '/') {
+			if (yych <= '"') {
+				if (yych <= '\f') {
+					if (yych <= 0x08) goto yy60;
+					if (yych <= '\n') goto yy65;
+				} else {
+					if (yych <= '\r') goto yy65;
+					if (yych >= '"') goto yy67;
+				}
 			} else {
-				if (yych <= '@') goto yy43;
-				if (yych <= 'Z') goto yy55;
+				if (yych <= '&') {
+					if (yych == '$') goto yy69;
+				} else {
+					if (yych <= '\'') goto yy70;
+					if (yych <= ',') goto yy60;
+					if (yych <= '.') goto yy71;
+				}
 			}
 		} else {
-			if (yych <= '^') {
-				if (yych <= '\\') goto yy57;
-				if (yych <= ']') goto yy58;
+			if (yych <= '[') {
+				if (yych <= ';') {
+					if (yych <= '9') goto yy72;
+					if (yych >= ';') goto yy65;
+				} else {
+					if (yych <= '@') goto yy60;
+					if (yych <= 'Z') goto yy75;
+				}
 			} else {
-				if (yych == '`') goto yy43;
-				if (yych <= 'z') goto yy55;
+				if (yych <= '^') {
+					if (yych <= '\\') goto yy78;
+					if (yych <= ']') goto yy79;
+				} else {
+					if (yych == '`') goto yy60;
+					if (yych <= 'z') goto yy75;
+				}
 			}
 		}
-	}
-yy43:
-	YYDEBUG(43, yych);
-	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-yy44:
-	YYDEBUG(44, yych);
-	if (yybm_ST_OFFSET[0+yych] & 4) goto yy43;
-	if (yych <= '"') goto yy45;
-	if (yych <= '$') goto yy59;
-	if (yych <= ';') goto yy45;
-	if (yych <= '\\') goto yy57;
-yy45:
-	YYDEBUG(45, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Get rest as section/offset value */
+yy60:
+		YYDEBUG(60, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+yy61:
+		YYDEBUG(61, *YYCURSOR);
+		if (yybm[0+yych] & 4) {
+			goto yy60;
+		}
+		if (yych <= '"') goto yy62;
+		if (yych <= '$') goto yy81;
+		if (yych <= ';') goto yy62;
+		if (yych <= '\\') goto yy78;
+yy62:
+		YYDEBUG(62, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Get rest as section/offset value */
 	RETURN_TOKEN(TC_STRING, yytext, yyleng);
 }
-yy46:
-	YYDEBUG(46, yych);
-	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_OFFSET[0+yych] & 8) goto yy46;
-	if (yych <= '$') {
-		if (yych <= '\r') {
-			if (yych <= 0x08) goto yy43;
-			if (yych <= '\n') goto yy45;
-			if (yych <= '\f') goto yy43;
-			goto yy45;
-		} else {
-			if (yych == '"') goto yy49;
-			if (yych <= '#') goto yy43;
-			goto yy59;
-		}
-	} else {
-		if (yych <= ';') {
-			if (yych == '\'') goto yy45;
-			if (yych <= ':') goto yy43;
-			goto yy45;
-		} else {
-			if (yych <= '[') goto yy43;
-			if (yych <= '\\') goto yy57;
-			if (yych <= ']') goto yy58;
-			goto yy43;
+yy63:
+		YYDEBUG(63, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(64, *YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy63;
+		}
+		if (yych <= '$') {
+			if (yych <= '\r') {
+				if (yych <= 0x08) goto yy60;
+				if (yych <= '\n') goto yy62;
+				if (yych <= '\f') goto yy60;
+				goto yy62;
+			} else {
+				if (yych == '"') goto yy67;
+				if (yych <= '#') goto yy60;
+				goto yy81;
+			}
+		} else {
+			if (yych <= ';') {
+				if (yych == '\'') goto yy62;
+				if (yych <= ':') goto yy60;
+				goto yy62;
+			} else {
+				if (yych <= '[') goto yy60;
+				if (yych <= '\\') goto yy78;
+				if (yych <= ']') goto yy79;
+				goto yy60;
+			}
 		}
-	}
-yy47:
-	YYDEBUG(47, yych);
-	++YYCURSOR;
-yy48:
-	YYDEBUG(48, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy65:
+		YYDEBUG(65, *YYCURSOR);
+		++YYCURSOR;
+yy66:
+		YYDEBUG(66, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	return 0;
 }
-yy49:
-	YYDEBUG(49, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Double quoted '"' string start */
+yy67:
+		YYDEBUG(67, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(68, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Double quoted '"' string start */
 	yy_push_state(ST_DOUBLE_QUOTES);
 	return '"';
 }
-yy50:
-	YYDEBUG(50, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '\\') {
-		if (yych <= 0x00) goto yy48;
-		if (yych <= '[') goto yy43;
-		goto yy61;
-	} else {
-		if (yych == '{') goto yy62;
-		goto yy43;
-	}
-yy51:
-	YYDEBUG(51, yych);
-	yych = *++YYCURSOR;
-	if (yybm_ST_OFFSET[0+yych] & 128) goto yy63;
-	goto yy48;
-yy52:
-	YYDEBUG(52, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy44;
-	if (yych <= '9') goto yy64;
-	goto yy44;
-yy53:
-	YYDEBUG(53, yych);
-	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_OFFSET[0+yych] & 16) goto yy53;
-	if (yych <= '&') {
-		if (yych <= '\r') {
-			if (yych == '\n') goto yy54;
-			if (yych <= '\f') goto yy43;
+yy69:
+		YYDEBUG(69, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\\') {
+			if (yych <= 0x00) goto yy66;
+			if (yych <= '[') goto yy60;
+			goto yy83;
 		} else {
-			if (yych <= '"') {
-				if (yych <= '!') goto yy43;
+			if (yych == '{') goto yy85;
+			goto yy60;
+		}
+yy70:
+		YYDEBUG(70, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yybm[0+yych] & 128) {
+			goto yy87;
+		}
+		goto yy66;
+yy71:
+		YYDEBUG(71, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '/') goto yy61;
+		if (yych <= '9') goto yy89;
+		goto yy61;
+yy72:
+		YYDEBUG(72, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(73, *YYCURSOR);
+		if (yybm[0+yych] & 16) {
+			goto yy72;
+		}
+		if (yych <= '&') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy74;
+				if (yych <= '\f') goto yy60;
 			} else {
-				if (yych == '$') goto yy59;
-				goto yy43;
+				if (yych <= '"') {
+					if (yych <= '!') goto yy60;
+				} else {
+					if (yych == '$') goto yy81;
+					goto yy60;
+				}
 			}
-		}
-	} else {
-		if (yych <= ':') {
-			if (yych <= '\'') goto yy54;
-			if (yych == '.') goto yy64;
-			goto yy43;
 		} else {
-			if (yych <= '[') {
-				if (yych >= '<') goto yy43;
+			if (yych <= ':') {
+				if (yych <= '\'') goto yy74;
+				if (yych == '.') goto yy89;
+				goto yy60;
 			} else {
-				if (yych <= '\\') goto yy57;
-				if (yych >= '^') goto yy43;
+				if (yych <= '[') {
+					if (yych >= '<') goto yy60;
+				} else {
+					if (yych <= '\\') goto yy78;
+					if (yych >= '^') goto yy60;
+				}
 			}
 		}
-	}
-yy54:
-	YYDEBUG(54, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Get number option value as string */
+yy74:
+		YYDEBUG(74, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Get number option value as string */
 	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
 }
-yy55:
-	YYDEBUG(55, yych);
-	yyaccept = 2;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_OFFSET[0+yych] & 32) goto yy55;
-	if (yych <= '$') {
-		if (yych <= '\r') {
-			if (yych == '\n') goto yy56;
-			if (yych <= '\f') goto yy43;
+yy75:
+		YYDEBUG(75, *YYCURSOR);
+		yyaccept = 2;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(76, *YYCURSOR);
+		if (yybm[0+yych] & 32) {
+			goto yy75;
+		}
+		if (yych <= '$') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy77;
+				if (yych <= '\f') goto yy60;
+			} else {
+				if (yych == '"') goto yy77;
+				if (yych <= '#') goto yy60;
+				goto yy81;
+			}
 		} else {
-			if (yych == '"') goto yy56;
-			if (yych <= '#') goto yy43;
-			goto yy59;
-		}
-	} else {
-		if (yych <= ';') {
-			if (yych == '\'') goto yy56;
-			if (yych <= ':') goto yy43;
-		} else {
-			if (yych <= '[') goto yy43;
-			if (yych <= '\\') goto yy57;
-			if (yych >= '^') goto yy43;
+			if (yych <= ';') {
+				if (yych == '\'') goto yy77;
+				if (yych <= ':') goto yy60;
+			} else {
+				if (yych <= '[') goto yy60;
+				if (yych <= '\\') goto yy78;
+				if (yych >= '^') goto yy60;
+			}
 		}
-	}
-yy56:
-	YYDEBUG(56, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Get constant option value */
+yy77:
+		YYDEBUG(77, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Get constant option value */
 	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
 }
-yy57:
-	YYDEBUG(57, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	goto yy43;
-yy58:
-	YYDEBUG(58, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* End of section or an option offset */
+yy78:
+		YYDEBUG(78, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		goto yy60;
+yy79:
+		YYDEBUG(79, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(80, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* End of section or an option offset */
 	BEGIN(INITIAL);
 	return ']';
 }
-yy59:
-	YYDEBUG(59, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\\') {
-		if (yych <= 0x00) goto yy60;
-		if (yych <= '[') goto yy43;
-		goto yy61;
-	} else {
-		if (yych != '{') goto yy43;
-	}
-yy60:
-	YYDEBUG(60, yych);
-	YYCURSOR = YYMARKER;
-	if (yyaccept <= 1) {
-		if (yyaccept == 0) goto yy45;
-		else goto yy54;
-	} else {
-		goto yy56;
-	}
-yy61:
-	YYDEBUG(61, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_OFFSET[0+yych] & 64) goto yy61;
-	goto yy43;
-yy62:
-	YYDEBUG(62, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Variable start */
-	yy_push_state(ST_VARNAME);
-	return TC_DOLLAR_CURLY;
-}
-yy63:
-	YYDEBUG(63, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_OFFSET[0+yych] & 128) goto yy63;
-	goto yy65;
-yy64:
-	YYDEBUG(64, yych);
-	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '&') {
-		if (yych <= '\r') {
-			if (yych == '\n') goto yy54;
-			if (yych <= '\f') goto yy43;
-			goto yy54;
+yy81:
+		YYDEBUG(81, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '\\') {
+			if (yych <= 0x00) goto yy82;
+			if (yych <= '[') goto yy60;
+			goto yy83;
 		} else {
-			if (yych <= '"') {
-				if (yych <= '!') goto yy43;
-				goto yy54;
+			if (yych != '{') goto yy60;
+		}
+yy82:
+		YYDEBUG(82, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		if (yyaccept <= 1) {
+			if (yyaccept == 0) {
+				goto yy62;
 			} else {
-				if (yych == '$') goto yy59;
-				goto yy43;
+				goto yy74;
 			}
+		} else {
+			goto yy77;
 		}
-	} else {
-		if (yych <= ':') {
-			if (yych <= '\'') goto yy54;
-			if (yych <= '/') goto yy43;
-			if (yych <= '9') goto yy64;
-			goto yy43;
+yy83:
+		YYDEBUG(83, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(84, *YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy83;
+		}
+		goto yy60;
+yy85:
+		YYDEBUG(85, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(86, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Variable start */
+	yy_push_state(ST_VARNAME);
+	return TC_DOLLAR_CURLY;
+}
+yy87:
+		YYDEBUG(87, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(88, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy87;
+		}
+		goto yy91;
+yy89:
+		YYDEBUG(89, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(90, *YYCURSOR);
+		if (yych <= '&') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy74;
+				if (yych <= '\f') goto yy60;
+				goto yy74;
+			} else {
+				if (yych <= '"') {
+					if (yych <= '!') goto yy60;
+					goto yy74;
+				} else {
+					if (yych == '$') goto yy81;
+					goto yy60;
+				}
+			}
 		} else {
-			if (yych <= '[') {
-				if (yych <= ';') goto yy54;
-				goto yy43;
-			} else {
-				if (yych <= '\\') goto yy57;
-				if (yych <= ']') goto yy54;
-				goto yy43;
+			if (yych <= ':') {
+				if (yych <= '\'') goto yy74;
+				if (yych <= '/') goto yy60;
+				if (yych <= '9') goto yy89;
+				goto yy60;
+			} else {
+				if (yych <= '[') {
+					if (yych <= ';') goto yy74;
+					goto yy60;
+				} else {
+					if (yych <= '\\') goto yy78;
+					if (yych <= ']') goto yy74;
+					goto yy60;
+				}
 			}
 		}
-	}
-yy65:
-	YYDEBUG(65, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Raw string */
+yy91:
+		YYDEBUG(91, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(92, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Raw string */
 	/* Eat leading and trailing single quotes */
 	if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') {
 		SCNG(yy_text)++;
@@ -1514,329 +1380,395 @@
 	}
 	RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
+	}
 /* *********************************** */
 yyc_ST_SECTION_VALUE:
-	YYFILL(2);
-	yych = *YYCURSOR;
-	YYDEBUG(66, yych);
-	if (yybm_ST_SECTION_VALUE[0+yych] & 8) goto yy70;
-	if (yych <= '/') {
-		if (yych <= '"') {
-			if (yych <= '\f') {
-				if (yych <= 0x08) goto yy67;
-				if (yych <= '\n') goto yy71;
+	{
+		static const unsigned char yybm[] = {
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 140, 128, 132, 132, 128, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			140, 132, 128, 132, 192, 132, 132,   0, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			180, 180, 180, 180, 180, 180, 180, 180, 
+			180, 180, 132, 128, 132, 132, 132, 132, 
+			132, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 132, 192, 128, 132, 164, 
+			132, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 164, 164, 164, 164, 164, 
+			164, 164, 164, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+			132, 132, 132, 132, 132, 132, 132, 132, 
+		};
+		YYDEBUG(93, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 8) {
+			goto yy98;
+		}
+		if (yych <= '/') {
+			if (yych <= '"') {
+				if (yych <= '\f') {
+					if (yych <= 0x08) goto yy95;
+					if (yych <= '\n') goto yy100;
+				} else {
+					if (yych <= '\r') goto yy100;
+					if (yych >= '"') goto yy102;
+				}
 			} else {
-				if (yych <= '\r') goto yy71;
-				if (yych >= '"') goto yy73;
+				if (yych <= '&') {
+					if (yych == '$') goto yy104;
+				} else {
+					if (yych <= '\'') goto yy105;
+					if (yych <= ',') goto yy95;
+					if (yych <= '.') goto yy106;
+				}
 			}
 		} else {
-			if (yych <= '&') {
-				if (yych == '$') goto yy74;
+			if (yych <= '[') {
+				if (yych <= ';') {
+					if (yych <= '9') goto yy107;
+					if (yych >= ';') goto yy100;
+				} else {
+					if (yych <= '@') goto yy95;
+					if (yych <= 'Z') goto yy110;
+				}
 			} else {
-				if (yych <= '\'') goto yy75;
-				if (yych <= ',') goto yy67;
-				if (yych <= '.') goto yy76;
+				if (yych <= '^') {
+					if (yych <= '\\') goto yy113;
+					if (yych <= ']') goto yy114;
+				} else {
+					if (yych == '`') goto yy95;
+					if (yych <= 'z') goto yy110;
+				}
 			}
 		}
-	} else {
-		if (yych <= '[') {
-			if (yych <= ';') {
-				if (yych <= '9') goto yy77;
-				if (yych >= ';') goto yy71;
-			} else {
-				if (yych <= '@') goto yy67;
-				if (yych <= 'Z') goto yy79;
+yy95:
+		YYDEBUG(95, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+yy96:
+		YYDEBUG(96, *YYCURSOR);
+		if (yybm[0+yych] & 4) {
+			goto yy95;
+		}
+		if (yych <= '"') goto yy97;
+		if (yych <= '$') goto yy117;
+		if (yych <= ';') goto yy97;
+		if (yych <= '\\') goto yy113;
+yy97:
+		YYDEBUG(97, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Get rest as section/offset value */
+	RETURN_TOKEN(TC_STRING, yytext, yyleng);
+}
+yy98:
+		YYDEBUG(98, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(99, *YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy98;
+		}
+		if (yych <= '$') {
+			if (yych <= '\r') {
+				if (yych <= 0x08) goto yy95;
+				if (yych <= '\n') goto yy97;
+				if (yych <= '\f') goto yy95;
+				goto yy97;
+			} else {
+				if (yych == '"') goto yy102;
+				if (yych <= '#') goto yy95;
+				goto yy117;
 			}
 		} else {
-			if (yych <= '^') {
-				if (yych <= '\\') goto yy81;
-				if (yych <= ']') goto yy82;
+			if (yych <= ';') {
+				if (yych == '\'') goto yy97;
+				if (yych <= ':') goto yy95;
+				goto yy97;
 			} else {
-				if (yych == '`') goto yy67;
-				if (yych <= 'z') goto yy79;
+				if (yych <= '[') goto yy95;
+				if (yych <= '\\') goto yy113;
+				if (yych <= ']') goto yy97;
+				goto yy95;
 			}
 		}
-	}
-yy67:
-	YYDEBUG(67, yych);
-	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-yy68:
-	YYDEBUG(68, yych);
-	if (yybm_ST_SECTION_VALUE[0+yych] & 4) goto yy67;
-	if (yych <= '"') goto yy69;
-	if (yych <= '$') goto yy84;
-	if (yych <= ';') goto yy69;
-	if (yych <= '\\') goto yy81;
-yy69:
-	YYDEBUG(69, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Get rest as section/offset value */
-	RETURN_TOKEN(TC_STRING, yytext, yyleng);
-}
-yy70:
-	YYDEBUG(70, yych);
-	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_SECTION_VALUE[0+yych] & 8) goto yy70;
-	if (yych <= '$') {
-		if (yych <= '\r') {
-			if (yych <= 0x08) goto yy67;
-			if (yych <= '\n') goto yy69;
-			if (yych <= '\f') goto yy67;
-			goto yy69;
-		} else {
-			if (yych == '"') goto yy73;
-			if (yych <= '#') goto yy67;
-			goto yy84;
-		}
-	} else {
-		if (yych <= ';') {
-			if (yych == '\'') goto yy69;
-			if (yych <= ':') goto yy67;
-			goto yy69;
-		} else {
-			if (yych <= '[') goto yy67;
-			if (yych <= '\\') goto yy81;
-			if (yych <= ']') goto yy69;
-			goto yy67;
-		}
-	}
-yy71:
-	YYDEBUG(71, yych);
-	++YYCURSOR;
-yy72:
-	YYDEBUG(72, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy100:
+		YYDEBUG(100, *YYCURSOR);
+		++YYCURSOR;
+yy101:
+		YYDEBUG(101, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	return 0;
 }
-yy73:
-	YYDEBUG(73, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Double quoted '"' string start */
+yy102:
+		YYDEBUG(102, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(103, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Double quoted '"' string start */
 	yy_push_state(ST_DOUBLE_QUOTES);
 	return '"';
 }
-yy74:
-	YYDEBUG(74, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '\\') {
-		if (yych <= 0x00) goto yy72;
-		if (yych <= '[') goto yy67;
-		goto yy86;
-	} else {
-		if (yych == '{') goto yy87;
-		goto yy67;
-	}
-yy75:
-	YYDEBUG(75, yych);
-	yych = *++YYCURSOR;
-	if (yybm_ST_SECTION_VALUE[0+yych] & 128) goto yy88;
-	goto yy72;
-yy76:
-	YYDEBUG(76, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy68;
-	if (yych <= '9') goto yy89;
-	goto yy68;
-yy77:
-	YYDEBUG(77, yych);
-	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_SECTION_VALUE[0+yych] & 16) goto yy77;
-	if (yych <= '&') {
-		if (yych <= '\r') {
-			if (yych == '\n') goto yy78;
-			if (yych <= '\f') goto yy67;
+yy104:
+		YYDEBUG(104, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\\') {
+			if (yych <= 0x00) goto yy101;
+			if (yych <= '[') goto yy95;
+			goto yy119;
 		} else {
-			if (yych <= '"') {
-				if (yych <= '!') goto yy67;
+			if (yych == '{') goto yy121;
+			goto yy95;
+		}
+yy105:
+		YYDEBUG(105, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yybm[0+yych] & 128) {
+			goto yy123;
+		}
+		goto yy101;
+yy106:
+		YYDEBUG(106, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '/') goto yy96;
+		if (yych <= '9') goto yy125;
+		goto yy96;
+yy107:
+		YYDEBUG(107, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(108, *YYCURSOR);
+		if (yybm[0+yych] & 16) {
+			goto yy107;
+		}
+		if (yych <= '&') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy109;
+				if (yych <= '\f') goto yy95;
 			} else {
-				if (yych == '$') goto yy84;
-				goto yy67;
+				if (yych <= '"') {
+					if (yych <= '!') goto yy95;
+				} else {
+					if (yych == '$') goto yy117;
+					goto yy95;
+				}
 			}
-		}
-	} else {
-		if (yych <= ':') {
-			if (yych <= '\'') goto yy78;
-			if (yych == '.') goto yy89;
-			goto yy67;
 		} else {
-			if (yych <= '[') {
-				if (yych >= '<') goto yy67;
+			if (yych <= ':') {
+				if (yych <= '\'') goto yy109;
+				if (yych == '.') goto yy125;
+				goto yy95;
 			} else {
-				if (yych <= '\\') goto yy81;
-				if (yych >= '^') goto yy67;
+				if (yych <= '[') {
+					if (yych >= '<') goto yy95;
+				} else {
+					if (yych <= '\\') goto yy113;
+					if (yych >= '^') goto yy95;
+				}
 			}
 		}
-	}
-yy78:
-	YYDEBUG(78, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Get number option value as string */
+yy109:
+		YYDEBUG(109, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Get number option value as string */
 	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
 }
-yy79:
-	YYDEBUG(79, yych);
-	yyaccept = 2;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_SECTION_VALUE[0+yych] & 32) goto yy79;
-	if (yych <= '$') {
-		if (yych <= '\r') {
-			if (yych == '\n') goto yy80;
-			if (yych <= '\f') goto yy67;
-		} else {
-			if (yych == '"') goto yy80;
-			if (yych <= '#') goto yy67;
-			goto yy84;
-		}
-	} else {
-		if (yych <= ';') {
-			if (yych == '\'') goto yy80;
-			if (yych <= ':') goto yy67;
+yy110:
+		YYDEBUG(110, *YYCURSOR);
+		yyaccept = 2;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(111, *YYCURSOR);
+		if (yybm[0+yych] & 32) {
+			goto yy110;
+		}
+		if (yych <= '$') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy112;
+				if (yych <= '\f') goto yy95;
+			} else {
+				if (yych == '"') goto yy112;
+				if (yych <= '#') goto yy95;
+				goto yy117;
+			}
 		} else {
-			if (yych <= '[') goto yy67;
-			if (yych <= '\\') goto yy81;
-			if (yych >= '^') goto yy67;
+			if (yych <= ';') {
+				if (yych == '\'') goto yy112;
+				if (yych <= ':') goto yy95;
+			} else {
+				if (yych <= '[') goto yy95;
+				if (yych <= '\\') goto yy113;
+				if (yych >= '^') goto yy95;
+			}
 		}
-	}
-yy80:
-	YYDEBUG(80, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Get constant option value */
+yy112:
+		YYDEBUG(112, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Get constant option value */
 	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
 }
-yy81:
-	YYDEBUG(81, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	goto yy67;
-yy82:
-	YYDEBUG(82, yych);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yych <= '\f') {
-		if (yych <= 0x08) goto yy83;
-		if (yych <= '\t') goto yy82;
-		if (yych <= '\n') goto yy90;
-	} else {
-		if (yych <= '\r') goto yy91;
-		if (yych == ' ') goto yy82;
-	}
-yy83:
-	YYDEBUG(83, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* End of section */
+yy113:
+		YYDEBUG(113, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		goto yy95;
+yy114:
+		YYDEBUG(114, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(115, *YYCURSOR);
+		if (yych <= '\f') {
+			if (yych <= 0x08) goto yy116;
+			if (yych <= '\t') goto yy114;
+			if (yych <= '\n') goto yy127;
+		} else {
+			if (yych <= '\r') goto yy128;
+			if (yych == ' ') goto yy114;
+		}
+yy116:
+		YYDEBUG(116, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* End of section */
 	BEGIN(INITIAL);
 	SCNG(lineno)++;
 	return ']';
 }
-yy84:
-	YYDEBUG(84, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\\') {
-		if (yych <= 0x00) goto yy85;
-		if (yych <= '[') goto yy67;
-		goto yy86;
-	} else {
-		if (yych != '{') goto yy67;
-	}
-yy85:
-	YYDEBUG(85, yych);
-	YYCURSOR = YYMARKER;
-	if (yyaccept <= 1) {
-		if (yyaccept == 0) goto yy69;
-		else goto yy78;
-	} else {
-		goto yy80;
-	}
-yy86:
-	YYDEBUG(86, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_SECTION_VALUE[0+yych] & 64) goto yy86;
-	goto yy67;
-yy87:
-	YYDEBUG(87, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Variable start */
-	yy_push_state(ST_VARNAME);
-	return TC_DOLLAR_CURLY;
-}
-yy88:
-	YYDEBUG(88, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_SECTION_VALUE[0+yych] & 128) goto yy88;
-	goto yy92;
-yy89:
-	YYDEBUG(89, yych);
-	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '&') {
-		if (yych <= '\r') {
-			if (yych == '\n') goto yy78;
-			if (yych <= '\f') goto yy67;
-			goto yy78;
+yy117:
+		YYDEBUG(117, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '\\') {
+			if (yych <= 0x00) goto yy118;
+			if (yych <= '[') goto yy95;
+			goto yy119;
 		} else {
-			if (yych <= '"') {
-				if (yych <= '!') goto yy67;
-				goto yy78;
+			if (yych != '{') goto yy95;
+		}
+yy118:
+		YYDEBUG(118, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		if (yyaccept <= 1) {
+			if (yyaccept == 0) {
+				goto yy97;
 			} else {
-				if (yych == '$') goto yy84;
-				goto yy67;
+				goto yy109;
 			}
+		} else {
+			goto yy112;
 		}
-	} else {
-		if (yych <= ':') {
-			if (yych <= '\'') goto yy78;
-			if (yych <= '/') goto yy67;
-			if (yych <= '9') goto yy89;
-			goto yy67;
+yy119:
+		YYDEBUG(119, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(120, *YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy119;
+		}
+		goto yy95;
+yy121:
+		YYDEBUG(121, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(122, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Variable start */
+	yy_push_state(ST_VARNAME);
+	return TC_DOLLAR_CURLY;
+}
+yy123:
+		YYDEBUG(123, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(124, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy123;
+		}
+		goto yy129;
+yy125:
+		YYDEBUG(125, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(126, *YYCURSOR);
+		if (yych <= '&') {
+			if (yych <= '\r') {
+				if (yych == '\n') goto yy109;
+				if (yych <= '\f') goto yy95;
+				goto yy109;
+			} else {
+				if (yych <= '"') {
+					if (yych <= '!') goto yy95;
+					goto yy109;
+				} else {
+					if (yych == '$') goto yy117;
+					goto yy95;
+				}
+			}
 		} else {
-			if (yych <= '[') {
-				if (yych <= ';') goto yy78;
-				goto yy67;
+			if (yych <= ':') {
+				if (yych <= '\'') goto yy109;
+				if (yych <= '/') goto yy95;
+				if (yych <= '9') goto yy125;
+				goto yy95;
 			} else {
-				if (yych <= '\\') goto yy81;
-				if (yych <= ']') goto yy78;
-				goto yy67;
+				if (yych <= '[') {
+					if (yych <= ';') goto yy109;
+					goto yy95;
+				} else {
+					if (yych <= '\\') goto yy113;
+					if (yych <= ']') goto yy109;
+					goto yy95;
+				}
 			}
 		}
-	}
-yy90:
-	YYDEBUG(90, yych);
-	++YYCURSOR;
-	goto yy83;
-yy91:
-	YYDEBUG(91, yych);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy90;
-	goto yy83;
-yy92:
-	YYDEBUG(92, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Raw string */
+yy127:
+		YYDEBUG(127, *YYCURSOR);
+		++YYCURSOR;
+		goto yy116;
+yy128:
+		YYDEBUG(128, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy127;
+		goto yy116;
+yy129:
+		YYDEBUG(129, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(130, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Raw string */
 	/* Eat leading and trailing single quotes */
 	if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') {
 		SCNG(yy_text)++;
@@ -1844,17 +1776,55 @@
 	}
 	RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
+	}
 /* *********************************** */
 yyc_ST_VALUE:
-	YYFILL(6);
-	yych = *YYCURSOR;
-	YYDEBUG(93, yych);
-	if (yybm_ST_VALUE[0+yych] & 4) goto yy99;
-	switch (yych) {
-		case 0x00: goto yy94;
+	{
+		static const unsigned char yybm[] = {
+			 80,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  84,  64,  82,  82,  64,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 84,  80,  80,  82, 208,  82,  80,  16, 
+			 80,  80,  82,  82,  82,  82,  82,  82, 
+			122, 122, 122, 122, 122, 122, 122, 122, 
+			122, 122,  82,  80,  82,  80,  82,  82, 
+			 82, 114, 114, 114, 114, 114, 114, 114, 
+			114, 114, 114, 114, 114, 114, 114, 114, 
+			114, 114, 114, 114, 114, 114, 114, 114, 
+			114, 114, 114,  82,  82,  82,  80, 114, 
+			 82, 114, 114, 114, 114, 114, 114, 114, 
+			114, 114, 114, 114, 114, 114, 114, 114, 
+			114, 114, 114, 114, 114, 114, 114, 114, 
+			114, 114, 114,  82,  80,  82,  80,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+			 82,  82,  82,  82,  82,  82,  82,  82, 
+		};
+		YYDEBUG(131, *YYCURSOR);
+		YYFILL(6);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 4) {
+			goto yy138;
+		}
+		switch (yych) {
+		case 0x00:	goto yy133;
 		case '\t':
-		case '\n': goto yy101;
-		case '\r': goto yy103;
+		case '\n':	goto yy141;
+		case '\r':	goto yy143;
 		case ' ':
 		case '!':
 		case '&':
@@ -1862,12 +1832,12 @@
 		case ')':
 		case '^':
 		case '|':
-		case '~': goto yy104;
-		case '"': goto yy105;
-		case '$': goto yy106;
-		case '\'': goto yy107;
+		case '~':	goto yy144;
+		case '"':	goto yy147;
+		case '$':	goto yy149;
+		case '\'':	goto yy150;
 		case '-':
-		case '.': goto yy108;
+		case '.':	goto yy151;
 		case '0':
 		case '1':
 		case '2':
@@ -1877,9 +1847,9 @@
 		case '6':
 		case '7':
 		case '8':
-		case '9': goto yy109;
-		case ';': goto yy111;
-		case '=': goto yy112;
+		case '9':	goto yy152;
+		case ';':	goto yy155;
+		case '=':	goto yy157;
 		case 'A':
 		case 'B':
 		case 'C':
@@ -1922,1008 +1892,1047 @@
 		case 'v':
 		case 'w':
 		case 'x':
-		case 'z': goto yy113;
+		case 'z':	goto yy159;
 		case 'F':
-		case 'f': goto yy115;
+		case 'f':	goto yy162;
 		case 'N':
-		case 'n': goto yy116;
+		case 'n':	goto yy163;
 		case 'O':
-		case 'o': goto yy117;
+		case 'o':	goto yy164;
 		case 'T':
-		case 't': goto yy118;
+		case 't':	goto yy165;
 		case 'Y':
-		case 'y': goto yy119;
-		default: goto yy96;
-	}
-yy94:
-	YYDEBUG(94, yych);
-	++YYCURSOR;
-yy95:
-	YYDEBUG(95, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* End of option value (if EOF is reached before EOL */
+		case 'y':	goto yy166;
+		default:	goto yy135;
+		}
+yy133:
+		YYDEBUG(133, *YYCURSOR);
+		++YYCURSOR;
+yy134:
+		YYDEBUG(134, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* End of option value (if EOF is reached before EOL */
 	BEGIN(INITIAL);
 	return END_OF_LINE;
 }
-yy96:
-	YYDEBUG(96, yych);
-	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-yy97:
-	YYDEBUG(97, yych);
-	if (yybm_ST_VALUE[0+yych] & 2) goto yy96;
-	if (yych <= '"') goto yy98;
-	if (yych <= '$') goto yy120;
-yy98:
-	YYDEBUG(98, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Get everything else as option/offset value */
+yy135:
+		YYDEBUG(135, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+yy136:
+		YYDEBUG(136, *YYCURSOR);
+		if (yybm[0+yych] & 2) {
+			goto yy135;
+		}
+		if (yych <= '"') goto yy137;
+		if (yych <= '$') goto yy167;
+yy137:
+		YYDEBUG(137, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Get everything else as option/offset value */
 	RETURN_TOKEN(TC_STRING, yytext, yyleng);
 }
-yy99:
-	YYDEBUG(99, yych);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yybm_ST_VALUE[0+yych] & 4) goto yy99;
-	if (yych <= '\r') {
-		if (yych <= 0x08) goto yy100;
-		if (yych <= '\n') goto yy101;
-		if (yych >= '\r') goto yy103;
-	} else {
-		if (yych <= '"') {
-			if (yych >= '"') goto yy105;
+yy138:
+		YYDEBUG(138, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(139, *YYCURSOR);
+		if (yybm[0+yych] & 4) {
+			goto yy138;
+		}
+		if (yych <= '\r') {
+			if (yych <= 0x08) goto yy140;
+			if (yych <= '\n') goto yy141;
+			if (yych >= '\r') goto yy143;
 		} else {
-			if (yych == ';') goto yy111;
+			if (yych <= '"') {
+				if (yych >= '"') goto yy147;
+			} else {
+				if (yych == ';') goto yy155;
+			}
 		}
-	}
-yy100:
-	YYDEBUG(100, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy140:
+		YYDEBUG(140, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(TC_WHITESPACE, yytext, yyleng);
 }
-yy101:
-	YYDEBUG(101, yych);
-	++YYCURSOR;
-yy102:
-	YYDEBUG(102, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* End of option value */
+yy141:
+		YYDEBUG(141, *YYCURSOR);
+		++YYCURSOR;
+yy142:
+		YYDEBUG(142, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* End of option value */
 	BEGIN(INITIAL);
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-yy103:
-	YYDEBUG(103, yych);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy101;
-	goto yy102;
-yy104:
-	YYDEBUG(104, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '\t') goto yy104;
-	if (yych == ' ') goto yy104;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Boolean operators */
+yy143:
+		YYDEBUG(143, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy141;
+		goto yy142;
+yy144:
+		YYDEBUG(144, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(145, *YYCURSOR);
+		if (yych == '\t') goto yy144;
+		if (yych == ' ') goto yy144;
+		YYDEBUG(146, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Boolean operators */
 	return yytext[0];
 }
-yy105:
-	YYDEBUG(105, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Double quoted '"' string start */
+yy147:
+		YYDEBUG(147, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(148, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Double quoted '"' string start */
 	yy_push_state(ST_DOUBLE_QUOTES);
 	return '"';
 }
-yy106:
-	YYDEBUG(106, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '\\') {
-		if (yych <= 0x00) goto yy95;
-		if (yych <= '[') goto yy96;
-		goto yy122;
-	} else {
-		if (yych == '{') goto yy123;
-		goto yy96;
-	}
-yy107:
-	YYDEBUG(107, yych);
-	yych = *++YYCURSOR;
-	if (yybm_ST_VALUE[0+yych] & 64) goto yy124;
-	goto yy95;
-yy108:
-	YYDEBUG(108, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') goto yy97;
-	if (yych <= '9') goto yy125;
-	goto yy97;
-yy109:
-	YYDEBUG(109, yych);
-	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VALUE[0+yych] & 8) goto yy109;
-	if (yych <= '-') {
-		if (yych <= 0x1F) {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy110;
-				if (yych <= 0x08) goto yy96;
-			} else {
-				if (yych != '\r') goto yy96;
-			}
-		} else {
-			if (yych <= '$') {
-				if (yych <= '"') goto yy110;
-				if (yych <= '#') goto yy96;
-				goto yy120;
-			} else {
-				if (yych <= '%') goto yy96;
-				if (yych >= '*') goto yy96;
-			}
+yy149:
+		YYDEBUG(149, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\\') {
+			if (yych <= 0x00) goto yy134;
+			if (yych <= '[') goto yy135;
+			goto yy169;
+		} else {
+			if (yych == '{') goto yy170;
+			goto yy135;
+		}
+yy150:
+		YYDEBUG(150, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yybm[0+yych] & 64) {
+			goto yy172;
 		}
-	} else {
-		if (yych <= ']') {
-			if (yych <= ';') {
-				if (yych <= '.') goto yy125;
-				if (yych <= ':') goto yy96;
+		goto yy134;
+yy151:
+		YYDEBUG(151, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '/') goto yy136;
+		if (yych <= '9') goto yy174;
+		goto yy136;
+yy152:
+		YYDEBUG(152, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(153, *YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy152;
+		}
+		if (yych <= '-') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy154;
+					if (yych <= 0x08) goto yy135;
+				} else {
+					if (yych != '\r') goto yy135;
+				}
 			} else {
-				if (yych != '=') goto yy96;
+				if (yych <= '$') {
+					if (yych <= '"') goto yy154;
+					if (yych <= '#') goto yy135;
+					goto yy167;
+				} else {
+					if (yych <= '%') goto yy135;
+					if (yych >= '*') goto yy135;
+				}
 			}
 		} else {
-			if (yych <= '|') {
-				if (yych <= '^') goto yy110;
-				if (yych <= '{') goto yy96;
+			if (yych <= ']') {
+				if (yych <= ';') {
+					if (yych <= '.') goto yy174;
+					if (yych <= ':') goto yy135;
+				} else {
+					if (yych != '=') goto yy135;
+				}
 			} else {
-				if (yych != '~') goto yy96;
+				if (yych <= '|') {
+					if (yych <= '^') goto yy154;
+					if (yych <= '{') goto yy135;
+				} else {
+					if (yych != '~') goto yy135;
+				}
 			}
 		}
-	}
-yy110:
-	YYDEBUG(110, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Get number option value as string */
+yy154:
+		YYDEBUG(154, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Get number option value as string */
 	RETURN_TOKEN(TC_NUMBER, yytext, yyleng);
 }
-yy111:
-	YYDEBUG(111, yych);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yybm_ST_VALUE[0+yych] & 16) goto yy111;
-	if (yych <= '\n') goto yy126;
-	goto yy128;
-yy112:
-	YYDEBUG(112, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Make = used in option value to trigger error */
+yy155:
+		YYDEBUG(155, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(156, *YYCURSOR);
+		if (yybm[0+yych] & 16) {
+			goto yy155;
+		}
+		if (yych <= '\n') goto yy176;
+		goto yy178;
+yy157:
+		YYDEBUG(157, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(158, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Make = used in option value to trigger error */
 	yyless(0);
 	BEGIN(INITIAL);
 	return END_OF_LINE;
 }
-yy113:
-	YYDEBUG(113, yych);
-	yyaccept = 2;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VALUE[0+yych] & 32) goto yy113;
-	if (yych <= ')') {
-		if (yych <= '\r') {
-			if (yych <= 0x08) {
-				if (yych >= 0x01) goto yy96;
-			} else {
-				if (yych <= '\n') goto yy114;
-				if (yych <= '\f') goto yy96;
-			}
-		} else {
-			if (yych <= '#') {
-				if (yych <= 0x1F) goto yy96;
-				if (yych >= '#') goto yy96;
-			} else {
-				if (yych <= '$') goto yy120;
-				if (yych <= '%') goto yy96;
-			}
-		}
-	} else {
-		if (yych <= ']') {
-			if (yych <= ';') {
-				if (yych <= ':') goto yy96;
+yy159:
+		YYDEBUG(159, *YYCURSOR);
+		yyaccept = 2;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(160, *YYCURSOR);
+		if (yybm[0+yych] & 32) {
+			goto yy159;
+		}
+		if (yych <= ')') {
+			if (yych <= '\r') {
+				if (yych <= 0x08) {
+					if (yych >= 0x01) goto yy135;
+				} else {
+					if (yych <= '\n') goto yy161;
+					if (yych <= '\f') goto yy135;
+				}
 			} else {
-				if (yych != '=') goto yy96;
+				if (yych <= '#') {
+					if (yych <= 0x1F) goto yy135;
+					if (yych >= '#') goto yy135;
+				} else {
+					if (yych <= '$') goto yy167;
+					if (yych <= '%') goto yy135;
+				}
 			}
 		} else {
-			if (yych <= '|') {
-				if (yych <= '^') goto yy114;
-				if (yych <= '{') goto yy96;
+			if (yych <= ']') {
+				if (yych <= ';') {
+					if (yych <= ':') goto yy135;
+				} else {
+					if (yych != '=') goto yy135;
+				}
 			} else {
-				if (yych != '~') goto yy96;
+				if (yych <= '|') {
+					if (yych <= '^') goto yy161;
+					if (yych <= '{') goto yy135;
+				} else {
+					if (yych != '~') goto yy135;
+				}
 			}
 		}
-	}
-yy114:
-	YYDEBUG(114, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Get constant option value */
+yy161:
+		YYDEBUG(161, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Get constant option value */
 	RETURN_TOKEN(TC_CONSTANT, yytext, yyleng);
 }
-yy115:
-	YYDEBUG(115, yych);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '<') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
-			}
-		} else {
-			if (yych <= '/') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				goto yy97;
-			} else {
-				if (yych <= '9') goto yy113;
-				if (yych == ';') goto yy114;
-				goto yy97;
-			}
-		}
-	} else {
-		if (yych <= '_') {
-			if (yych <= 'A') {
-				if (yych <= '=') goto yy114;
-				if (yych <= '@') goto yy97;
-				goto yy129;
+yy162:
+		YYDEBUG(162, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '<') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
 			} else {
-				if (yych <= 'Z') goto yy113;
-				if (yych <= ']') goto yy97;
-				if (yych <= '^') goto yy114;
-				goto yy113;
+				if (yych <= '/') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					goto yy136;
+				} else {
+					if (yych <= '9') goto yy159;
+					if (yych == ';') goto yy161;
+					goto yy136;
+				}
 			}
 		} else {
-			if (yych <= '{') {
-				if (yych <= '`') goto yy97;
-				if (yych <= 'a') goto yy129;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
+			if (yych <= '_') {
+				if (yych <= 'A') {
+					if (yych <= '=') goto yy161;
+					if (yych <= '@') goto yy136;
+					goto yy179;
+				} else {
+					if (yych <= 'Z') goto yy159;
+					if (yych <= ']') goto yy136;
+					if (yych <= '^') goto yy161;
+					goto yy159;
+				}
 			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
+				if (yych <= '{') {
+					if (yych <= '`') goto yy136;
+					if (yych <= 'a') goto yy179;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
+				}
 			}
 		}
-	}
-yy116:
-	YYDEBUG(116, yych);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'N') {
-		if (yych <= '%') {
-			if (yych <= '\f') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				if (yych <= '\n') goto yy114;
-				goto yy97;
+yy163:
+		YYDEBUG(163, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'N') {
+			if (yych <= '%') {
+				if (yych <= '\f') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					if (yych <= '\n') goto yy161;
+					goto yy136;
+				} else {
+					if (yych <= '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					if (yych <= '"') goto yy161;
+					goto yy136;
+				}
 			} else {
-				if (yych <= '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				if (yych <= '"') goto yy114;
-				goto yy97;
+				if (yych <= ':') {
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					if (yych <= '9') goto yy159;
+					goto yy136;
+				} else {
+					if (yych <= '<') {
+						if (yych <= ';') goto yy161;
+						goto yy136;
+					} else {
+						if (yych <= '=') goto yy161;
+						if (yych <= '@') goto yy136;
+						goto yy159;
+					}
+				}
 			}
 		} else {
-			if (yych <= ':') {
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				if (yych <= '9') goto yy113;
-				goto yy97;
+			if (yych <= 'n') {
+				if (yych <= 'Z') {
+					if (yych <= 'O') goto yy180;
+					if (yych == 'U') goto yy182;
+					goto yy159;
+				} else {
+					if (yych <= '^') {
+						if (yych <= ']') goto yy136;
+						goto yy161;
+					} else {
+						if (yych == '`') goto yy136;
+						goto yy159;
+					}
+				}
 			} else {
-				if (yych <= '<') {
-					if (yych <= ';') goto yy114;
-					goto yy97;
-				} else {
-					if (yych <= '=') goto yy114;
-					if (yych <= '@') goto yy97;
-					goto yy113;
+				if (yych <= 'z') {
+					if (yych <= 'o') goto yy180;
+					if (yych == 'u') goto yy182;
+					goto yy159;
+				} else {
+					if (yych <= '|') {
+						if (yych <= '{') goto yy136;
+						goto yy161;
+					} else {
+						if (yych == '~') goto yy161;
+						goto yy136;
+					}
 				}
 			}
 		}
-	} else {
-		if (yych <= 'n') {
-			if (yych <= 'Z') {
-				if (yych <= 'O') goto yy130;
-				if (yych == 'U') goto yy132;
-				goto yy113;
+yy164:
+		YYDEBUG(164, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'E') {
+			if (yych <= '%') {
+				if (yych <= '\f') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					if (yych <= '\n') goto yy161;
+					goto yy136;
+				} else {
+					if (yych <= '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					if (yych <= '"') goto yy161;
+					goto yy136;
+				}
 			} else {
-				if (yych <= '^') {
-					if (yych <= ']') goto yy97;
-					goto yy114;
+				if (yych <= ':') {
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					if (yych <= '9') goto yy159;
+					goto yy136;
 				} else {
-					if (yych == '`') goto yy97;
-					goto yy113;
+					if (yych <= '<') {
+						if (yych <= ';') goto yy161;
+						goto yy136;
+					} else {
+						if (yych <= '=') goto yy161;
+						if (yych <= '@') goto yy136;
+						goto yy159;
+					}
 				}
 			}
 		} else {
-			if (yych <= 'z') {
-				if (yych <= 'o') goto yy130;
-				if (yych == 'u') goto yy132;
-				goto yy113;
+			if (yych <= 'e') {
+				if (yych <= 'Z') {
+					if (yych <= 'F') goto yy183;
+					if (yych == 'N') goto yy184;
+					goto yy159;
+				} else {
+					if (yych <= '^') {
+						if (yych <= ']') goto yy136;
+						goto yy161;
+					} else {
+						if (yych == '`') goto yy136;
+						goto yy159;
+					}
+				}
 			} else {
-				if (yych <= '|') {
-					if (yych <= '{') goto yy97;
-					goto yy114;
+				if (yych <= 'z') {
+					if (yych <= 'f') goto yy183;
+					if (yych == 'n') goto yy184;
+					goto yy159;
 				} else {
-					if (yych == '~') goto yy114;
-					goto yy97;
+					if (yych <= '|') {
+						if (yych <= '{') goto yy136;
+						goto yy161;
+					} else {
+						if (yych == '~') goto yy161;
+						goto yy136;
+					}
 				}
 			}
 		}
-	}
-yy117:
-	YYDEBUG(117, yych);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'E') {
-		if (yych <= '%') {
-			if (yych <= '\f') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				if (yych <= '\n') goto yy114;
-				goto yy97;
+yy165:
+		YYDEBUG(165, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
 			} else {
-				if (yych <= '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				if (yych <= '"') goto yy114;
-				goto yy97;
+				if (yych <= '9') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					goto yy159;
+				} else {
+					if (yych == ';') goto yy161;
+					if (yych <= '<') goto yy136;
+					goto yy161;
+				}
 			}
 		} else {
-			if (yych <= ':') {
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				if (yych <= '9') goto yy113;
-				goto yy97;
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy136;
+					if (yych == 'R') goto yy186;
+					goto yy159;
+				} else {
+					if (yych <= ']') goto yy136;
+					if (yych <= '^') goto yy161;
+					if (yych <= '_') goto yy159;
+					goto yy136;
+				}
 			} else {
-				if (yych <= '<') {
-					if (yych <= ';') goto yy114;
-					goto yy97;
-				} else {
-					if (yych <= '=') goto yy114;
-					if (yych <= '@') goto yy97;
-					goto yy113;
+				if (yych <= '{') {
+					if (yych == 'r') goto yy186;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
 				}
 			}
 		}
-	} else {
-		if (yych <= 'e') {
-			if (yych <= 'Z') {
-				if (yych <= 'F') goto yy133;
-				if (yych == 'N') goto yy134;
-				goto yy113;
+yy166:
+		YYDEBUG(166, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
 			} else {
-				if (yych <= '^') {
-					if (yych <= ']') goto yy97;
-					goto yy114;
+				if (yych <= '9') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					goto yy159;
 				} else {
-					if (yych == '`') goto yy97;
-					goto yy113;
+					if (yych == ';') goto yy161;
+					if (yych <= '<') goto yy136;
+					goto yy161;
 				}
 			}
 		} else {
-			if (yych <= 'z') {
-				if (yych <= 'f') goto yy133;
-				if (yych == 'n') goto yy134;
-				goto yy113;
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy136;
+					if (yych == 'E') goto yy187;
+					goto yy159;
+				} else {
+					if (yych <= ']') goto yy136;
+					if (yych <= '^') goto yy161;
+					if (yych <= '_') goto yy159;
+					goto yy136;
+				}
 			} else {
-				if (yych <= '|') {
-					if (yych <= '{') goto yy97;
-					goto yy114;
+				if (yych <= '{') {
+					if (yych == 'e') goto yy187;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
 				} else {
-					if (yych == '~') goto yy114;
-					goto yy97;
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
 				}
 			}
 		}
-	}
-yy118:
-	YYDEBUG(118, yych);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
-			}
-		} else {
-			if (yych <= '9') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				goto yy113;
-			} else {
-				if (yych == ';') goto yy114;
-				if (yych <= '<') goto yy97;
-				goto yy114;
-			}
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy97;
-				if (yych == 'R') goto yy136;
-				goto yy113;
-			} else {
-				if (yych <= ']') goto yy97;
-				if (yych <= '^') goto yy114;
-				if (yych <= '_') goto yy113;
-				goto yy97;
-			}
+yy167:
+		YYDEBUG(167, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '\\') {
+			if (yych <= 0x00) goto yy168;
+			if (yych <= '[') goto yy135;
+			goto yy169;
 		} else {
-			if (yych <= '{') {
-				if (yych == 'r') goto yy136;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
-			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
-			}
+			if (yych != '{') goto yy135;
 		}
-	}
-yy119:
-	YYDEBUG(119, yych);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
-			}
-		} else {
-			if (yych <= '9') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				goto yy113;
-			} else {
-				if (yych == ';') goto yy114;
-				if (yych <= '<') goto yy97;
-				goto yy114;
-			}
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy97;
-				if (yych == 'E') goto yy137;
-				goto yy113;
+yy168:
+		YYDEBUG(168, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		if (yyaccept <= 2) {
+			if (yyaccept <= 1) {
+				if (yyaccept == 0) {
+					goto yy137;
+				} else {
+					goto yy154;
+				}
 			} else {
-				if (yych <= ']') goto yy97;
-				if (yych <= '^') goto yy114;
-				if (yych <= '_') goto yy113;
-				goto yy97;
+				goto yy161;
 			}
 		} else {
-			if (yych <= '{') {
-				if (yych == 'e') goto yy137;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
+			if (yyaccept <= 4) {
+				if (yyaccept == 3) {
+					goto yy181;
+				} else {
+					goto yy185;
+				}
 			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
+				goto yy202;
 			}
 		}
-	}
-yy120:
-	YYDEBUG(120, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\\') {
-		if (yych <= 0x00) goto yy121;
-		if (yych <= '[') goto yy96;
-		goto yy122;
-	} else {
-		if (yych != '{') goto yy96;
-	}
-yy121:
-	YYDEBUG(121, yych);
-	YYCURSOR = YYMARKER;
-	if (yyaccept <= 2) {
-		if (yyaccept <= 1) {
-			if (yyaccept == 0) goto yy98;
-			else goto yy110;
-		} else {
-			goto yy114;
-		}
-	} else {
-		if (yyaccept <= 4) {
-			if (yyaccept == 3) goto yy131;
-			else goto yy135;
-		} else {
-			goto yy148;
+yy169:
+		YYDEBUG(169, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 128) {
+			goto yy188;
 		}
-	}
-yy122:
-	YYDEBUG(122, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VALUE[0+yych] & 128) goto yy138;
-	goto yy96;
-yy123:
-	YYDEBUG(123, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Variable start */
+		goto yy135;
+yy170:
+		YYDEBUG(170, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(171, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Variable start */
 	yy_push_state(ST_VARNAME);
 	return TC_DOLLAR_CURLY;
 }
-yy124:
-	YYDEBUG(124, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VALUE[0+yych] & 64) goto yy124;
-	goto yy139;
-yy125:
-	YYDEBUG(125, yych);
-	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '/') {
-		if (yych <= 0x1F) {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy110;
-				if (yych <= 0x08) goto yy96;
-				goto yy110;
-			} else {
-				if (yych == '\r') goto yy110;
-				goto yy96;
-			}
-		} else {
-			if (yych <= '$') {
-				if (yych <= '"') goto yy110;
-				if (yych <= '#') goto yy96;
-				goto yy120;
-			} else {
-				if (yych <= '%') goto yy96;
-				if (yych <= ')') goto yy110;
-				goto yy96;
-			}
+yy172:
+		YYDEBUG(172, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(173, *YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy172;
 		}
-	} else {
-		if (yych <= ']') {
-			if (yych <= ';') {
-				if (yych <= '9') goto yy125;
-				if (yych <= ':') goto yy96;
-				goto yy110;
+		goto yy190;
+yy174:
+		YYDEBUG(174, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(175, *YYCURSOR);
+		if (yych <= '/') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy154;
+					if (yych <= 0x08) goto yy135;
+					goto yy154;
+				} else {
+					if (yych == '\r') goto yy154;
+					goto yy135;
+				}
 			} else {
-				if (yych == '=') goto yy110;
-				goto yy96;
+				if (yych <= '$') {
+					if (yych <= '"') goto yy154;
+					if (yych <= '#') goto yy135;
+					goto yy167;
+				} else {
+					if (yych <= '%') goto yy135;
+					if (yych <= ')') goto yy154;
+					goto yy135;
+				}
 			}
 		} else {
-			if (yych <= '|') {
-				if (yych <= '^') goto yy110;
-				if (yych <= '{') goto yy96;
-				goto yy110;
+			if (yych <= ']') {
+				if (yych <= ';') {
+					if (yych <= '9') goto yy174;
+					if (yych <= ':') goto yy135;
+					goto yy154;
+				} else {
+					if (yych == '=') goto yy154;
+					goto yy135;
+				}
 			} else {
-				if (yych == '~') goto yy110;
-				goto yy96;
+				if (yych <= '|') {
+					if (yych <= '^') goto yy154;
+					if (yych <= '{') goto yy135;
+					goto yy154;
+				} else {
+					if (yych == '~') goto yy154;
+					goto yy135;
+				}
 			}
 		}
-	}
-yy126:
-	YYDEBUG(126, yych);
-	++YYCURSOR;
-yy127:
-	YYDEBUG(127, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Comment */
+yy176:
+		YYDEBUG(176, *YYCURSOR);
+		++YYCURSOR;
+yy177:
+		YYDEBUG(177, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Comment */
 	BEGIN(INITIAL);
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-yy128:
-	YYDEBUG(128, yych);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy126;
-	goto yy127;
-yy129:
-	YYDEBUG(129, yych);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
-			}
-		} else {
-			if (yych <= '9') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				goto yy113;
-			} else {
-				if (yych == ';') goto yy114;
-				if (yych <= '<') goto yy97;
-				goto yy114;
-			}
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy97;
-				if (yych == 'L') goto yy140;
-				goto yy113;
+yy178:
+		YYDEBUG(178, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy176;
+		goto yy177;
+yy179:
+		YYDEBUG(179, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
 			} else {
-				if (yych <= ']') goto yy97;
-				if (yych <= '^') goto yy114;
-				if (yych <= '_') goto yy113;
-				goto yy97;
+				if (yych <= '9') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					goto yy159;
+				} else {
+					if (yych == ';') goto yy161;
+					if (yych <= '<') goto yy136;
+					goto yy161;
+				}
 			}
 		} else {
-			if (yych <= '{') {
-				if (yych == 'l') goto yy140;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
-			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
-			}
-		}
-	}
-yy130:
-	YYDEBUG(130, yych);
-	yyaccept = 3;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '<') {
-		if (yych <= ' ') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy131;
-				if (yych <= 0x08) goto yy97;
-				if (yych <= '\t') goto yy141;
-			} else {
-				if (yych == '\r') goto yy131;
-				if (yych <= 0x1F) goto yy97;
-				goto yy141;
-			}
-		} else {
-			if (yych <= '/') {
-				if (yych <= '"') goto yy131;
-				if (yych <= '%') goto yy97;
-				if (yych >= '*') goto yy97;
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy136;
+					if (yych == 'L') goto yy192;
+					goto yy159;
+				} else {
+					if (yych <= ']') goto yy136;
+					if (yych <= '^') goto yy161;
+					if (yych <= '_') goto yy159;
+					goto yy136;
+				}
 			} else {
-				if (yych <= '9') goto yy113;
-				if (yych != ';') goto yy97;
+				if (yych <= '{') {
+					if (yych == 'l') goto yy192;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
+				}
 			}
 		}
-	} else {
-		if (yych <= '_') {
-			if (yych <= 'N') {
-				if (yych <= '=') goto yy131;
-				if (yych <= '@') goto yy97;
-				if (yych <= 'M') goto yy113;
-				goto yy142;
+yy180:
+		YYDEBUG(180, *YYCURSOR);
+		yyaccept = 3;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '<') {
+			if (yych <= ' ') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy181;
+					if (yych <= 0x08) goto yy136;
+					if (yych <= '\t') goto yy193;
+				} else {
+					if (yych == '\r') goto yy181;
+					if (yych <= 0x1F) goto yy136;
+					goto yy193;
+				}
 			} else {
-				if (yych <= 'Z') goto yy113;
-				if (yych <= ']') goto yy97;
-				if (yych >= '_') goto yy113;
+				if (yych <= '/') {
+					if (yych <= '"') goto yy181;
+					if (yych <= '%') goto yy136;
+					if (yych >= '*') goto yy136;
+				} else {
+					if (yych <= '9') goto yy159;
+					if (yych != ';') goto yy136;
+				}
 			}
 		} else {
-			if (yych <= 'z') {
-				if (yych <= '`') goto yy97;
-				if (yych == 'n') goto yy142;
-				goto yy113;
+			if (yych <= '_') {
+				if (yych <= 'N') {
+					if (yych <= '=') goto yy181;
+					if (yych <= '@') goto yy136;
+					if (yych <= 'M') goto yy159;
+					goto yy195;
+				} else {
+					if (yych <= 'Z') goto yy159;
+					if (yych <= ']') goto yy136;
+					if (yych >= '_') goto yy159;
+				}
 			} else {
-				if (yych <= '|') {
-					if (yych <= '{') goto yy97;
+				if (yych <= 'z') {
+					if (yych <= '`') goto yy136;
+					if (yych == 'n') goto yy195;
+					goto yy159;
 				} else {
-					if (yych != '~') goto yy97;
+					if (yych <= '|') {
+						if (yych <= '{') goto yy136;
+					} else {
+						if (yych != '~') goto yy136;
+					}
 				}
 			}
 		}
-	}
-yy131:
-	YYDEBUG(131, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* FALSE value (when used outside option value/offset this causes parse error!)*/
+yy181:
+		YYDEBUG(181, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* FALSE value (when used outside option value/offset this causes parse error!)*/
 	RETURN_TOKEN(BOOL_FALSE, "", 0);
 }
-yy132:
-	YYDEBUG(132, yych);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
-			}
-		} else {
-			if (yych <= '9') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				goto yy113;
-			} else {
-				if (yych == ';') goto yy114;
-				if (yych <= '<') goto yy97;
-				goto yy114;
-			}
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy97;
-				if (yych == 'L') goto yy143;
-				goto yy113;
+yy182:
+		YYDEBUG(182, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
 			} else {
-				if (yych <= ']') goto yy97;
-				if (yych <= '^') goto yy114;
-				if (yych <= '_') goto yy113;
-				goto yy97;
+				if (yych <= '9') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					goto yy159;
+				} else {
+					if (yych == ';') goto yy161;
+					if (yych <= '<') goto yy136;
+					goto yy161;
+				}
 			}
 		} else {
-			if (yych <= '{') {
-				if (yych == 'l') goto yy143;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy136;
+					if (yych == 'L') goto yy196;
+					goto yy159;
+				} else {
+					if (yych <= ']') goto yy136;
+					if (yych <= '^') goto yy161;
+					if (yych <= '_') goto yy159;
+					goto yy136;
+				}
 			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
-			}
-		}
-	}
-yy133:
-	YYDEBUG(133, yych);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
-			}
-		} else {
-			if (yych <= '9') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				goto yy113;
-			} else {
-				if (yych == ';') goto yy114;
-				if (yych <= '<') goto yy97;
-				goto yy114;
+				if (yych <= '{') {
+					if (yych == 'l') goto yy196;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
+				}
 			}
 		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy97;
-				if (yych == 'F') goto yy144;
-				goto yy113;
+yy183:
+		YYDEBUG(183, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
 			} else {
-				if (yych <= ']') goto yy97;
-				if (yych <= '^') goto yy114;
-				if (yych <= '_') goto yy113;
-				goto yy97;
+				if (yych <= '9') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					goto yy159;
+				} else {
+					if (yych == ';') goto yy161;
+					if (yych <= '<') goto yy136;
+					goto yy161;
+				}
 			}
 		} else {
-			if (yych <= '{') {
-				if (yych == 'f') goto yy144;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy136;
+					if (yych == 'F') goto yy197;
+					goto yy159;
+				} else {
+					if (yych <= ']') goto yy136;
+					if (yych <= '^') goto yy161;
+					if (yych <= '_') goto yy159;
+					goto yy136;
+				}
 			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
+				if (yych <= '{') {
+					if (yych == 'f') goto yy197;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
+				}
 			}
 		}
-	}
-yy134:
-	YYDEBUG(134, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_VALUE[0+yych] & 32) goto yy113;
-	if (yych <= ')') {
-		if (yych <= '\f') {
-			if (yych <= 0x08) {
-				if (yych >= 0x01) goto yy97;
-			} else {
-				if (yych <= '\t') goto yy145;
-				if (yych >= '\v') goto yy97;
-			}
-		} else {
-			if (yych <= ' ') {
-				if (yych <= '\r') goto yy135;
-				if (yych <= 0x1F) goto yy97;
-				goto yy145;
-			} else {
-				if (yych <= '"') goto yy135;
-				if (yych <= '%') goto yy97;
-			}
+yy184:
+		YYDEBUG(184, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 32) {
+			goto yy159;
 		}
-	} else {
-		if (yych <= ']') {
-			if (yych <= ';') {
-				if (yych <= ':') goto yy97;
+		if (yych <= ')') {
+			if (yych <= '\f') {
+				if (yych <= 0x08) {
+					if (yych >= 0x01) goto yy136;
+				} else {
+					if (yych <= '\t') goto yy198;
+					if (yych >= '\v') goto yy136;
+				}
 			} else {
-				if (yych != '=') goto yy97;
+				if (yych <= ' ') {
+					if (yych <= '\r') goto yy185;
+					if (yych <= 0x1F) goto yy136;
+					goto yy198;
+				} else {
+					if (yych <= '"') goto yy185;
+					if (yych <= '%') goto yy136;
+				}
 			}
 		} else {
-			if (yych <= '|') {
-				if (yych <= '^') goto yy135;
-				if (yych <= '{') goto yy97;
+			if (yych <= ']') {
+				if (yych <= ';') {
+					if (yych <= ':') goto yy136;
+				} else {
+					if (yych != '=') goto yy136;
+				}
 			} else {
-				if (yych != '~') goto yy97;
+				if (yych <= '|') {
+					if (yych <= '^') goto yy185;
+					if (yych <= '{') goto yy136;
+				} else {
+					if (yych != '~') goto yy136;
+				}
 			}
 		}
-	}
-yy135:
-	YYDEBUG(135, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* TRUE value (when used outside option value/offset this causes parse error!) */
+yy185:
+		YYDEBUG(185, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* TRUE value (when used outside option value/offset this causes parse error!) */
 	RETURN_TOKEN(BOOL_TRUE, "1", 1);
 }
-yy136:
-	YYDEBUG(136, yych);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
-			}
-		} else {
-			if (yych <= '9') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				goto yy113;
-			} else {
-				if (yych == ';') goto yy114;
-				if (yych <= '<') goto yy97;
-				goto yy114;
-			}
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy97;
-				if (yych == 'U') goto yy146;
-				goto yy113;
+yy186:
+		YYDEBUG(186, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
 			} else {
-				if (yych <= ']') goto yy97;
-				if (yych <= '^') goto yy114;
-				if (yych <= '_') goto yy113;
-				goto yy97;
+				if (yych <= '9') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					goto yy159;
+				} else {
+					if (yych == ';') goto yy161;
+					if (yych <= '<') goto yy136;
+					goto yy161;
+				}
 			}
 		} else {
-			if (yych <= '{') {
-				if (yych == 'u') goto yy146;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy136;
+					if (yych == 'U') goto yy200;
+					goto yy159;
+				} else {
+					if (yych <= ']') goto yy136;
+					if (yych <= '^') goto yy161;
+					if (yych <= '_') goto yy159;
+					goto yy136;
+				}
 			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
-			}
-		}
-	}
-yy137:
-	YYDEBUG(137, yych);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
-			}
-		} else {
-			if (yych <= '9') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				goto yy113;
-			} else {
-				if (yych == ';') goto yy114;
-				if (yych <= '<') goto yy97;
-				goto yy114;
+				if (yych <= '{') {
+					if (yych == 'u') goto yy200;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
+				}
 			}
 		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy97;
-				if (yych == 'S') goto yy134;
-				goto yy113;
+yy187:
+		YYDEBUG(187, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
 			} else {
-				if (yych <= ']') goto yy97;
-				if (yych <= '^') goto yy114;
-				if (yych <= '_') goto yy113;
-				goto yy97;
+				if (yych <= '9') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					goto yy159;
+				} else {
+					if (yych == ';') goto yy161;
+					if (yych <= '<') goto yy136;
+					goto yy161;
+				}
 			}
 		} else {
-			if (yych <= '{') {
-				if (yych == 's') goto yy134;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy136;
+					if (yych == 'S') goto yy184;
+					goto yy159;
+				} else {
+					if (yych <= ']') goto yy136;
+					if (yych <= '^') goto yy161;
+					if (yych <= '_') goto yy159;
+					goto yy136;
+				}
 			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
+				if (yych <= '{') {
+					if (yych == 's') goto yy184;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
+				}
 			}
 		}
-	}
-yy138:
-	YYDEBUG(138, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VALUE[0+yych] & 128) goto yy138;
-	if (yych <= 0x00) goto yy98;
-	if (yych == '\\') goto yy122;
-	goto yy96;
-yy139:
-	YYDEBUG(139, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Raw string */
+yy188:
+		YYDEBUG(188, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(189, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy188;
+		}
+		if (yych <= 0x00) goto yy137;
+		if (yych == '\\') goto yy169;
+		goto yy135;
+yy190:
+		YYDEBUG(190, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(191, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Raw string */
 	/* Eat leading and trailing single quotes */
 	if (yytext[0] == '\'' && yytext[yyleng - 1] == '\'') {
 		SCNG(yy_text)++;
@@ -2931,388 +2940,478 @@
 	}
 	RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-yy140:
-	YYDEBUG(140, yych);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
-			}
-		} else {
-			if (yych <= '9') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				goto yy113;
-			} else {
-				if (yych == ';') goto yy114;
-				if (yych <= '<') goto yy97;
-				goto yy114;
-			}
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy97;
-				if (yych == 'S') goto yy142;
-				goto yy113;
+yy192:
+		YYDEBUG(192, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
 			} else {
-				if (yych <= ']') goto yy97;
-				if (yych <= '^') goto yy114;
-				if (yych <= '_') goto yy113;
-				goto yy97;
+				if (yych <= '9') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					goto yy159;
+				} else {
+					if (yych == ';') goto yy161;
+					if (yych <= '<') goto yy136;
+					goto yy161;
+				}
 			}
 		} else {
-			if (yych <= '{') {
-				if (yych == 's') goto yy142;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy136;
+					if (yych == 'S') goto yy195;
+					goto yy159;
+				} else {
+					if (yych <= ']') goto yy136;
+					if (yych <= '^') goto yy161;
+					if (yych <= '_') goto yy159;
+					goto yy136;
+				}
 			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
-			}
-		}
-	}
-yy141:
-	YYDEBUG(141, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '\t') goto yy141;
-	if (yych == ' ') goto yy141;
-	goto yy131;
-yy142:
-	YYDEBUG(142, yych);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
-			}
-		} else {
-			if (yych <= '9') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				goto yy113;
-			} else {
-				if (yych == ';') goto yy114;
-				if (yych <= '<') goto yy97;
-				goto yy114;
+				if (yych <= '{') {
+					if (yych == 's') goto yy195;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
+				}
 			}
 		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy97;
-				if (yych == 'E') goto yy144;
-				goto yy113;
+yy193:
+		YYDEBUG(193, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(194, *YYCURSOR);
+		if (yych == '\t') goto yy193;
+		if (yych == ' ') goto yy193;
+		goto yy181;
+yy195:
+		YYDEBUG(195, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
 			} else {
-				if (yych <= ']') goto yy97;
-				if (yych <= '^') goto yy114;
-				if (yych <= '_') goto yy113;
-				goto yy97;
+				if (yych <= '9') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					goto yy159;
+				} else {
+					if (yych == ';') goto yy161;
+					if (yych <= '<') goto yy136;
+					goto yy161;
+				}
 			}
 		} else {
-			if (yych <= '{') {
-				if (yych == 'e') goto yy144;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy136;
+					if (yych == 'E') goto yy197;
+					goto yy159;
+				} else {
+					if (yych <= ']') goto yy136;
+					if (yych <= '^') goto yy161;
+					if (yych <= '_') goto yy159;
+					goto yy136;
+				}
 			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
-			}
-		}
-	}
-yy143:
-	YYDEBUG(143, yych);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
-			}
-		} else {
-			if (yych <= '9') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				goto yy113;
-			} else {
-				if (yych == ';') goto yy114;
-				if (yych <= '<') goto yy97;
-				goto yy114;
+				if (yych <= '{') {
+					if (yych == 'e') goto yy197;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
+				}
 			}
 		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy97;
-				if (yych == 'L') goto yy147;
-				goto yy113;
+yy196:
+		YYDEBUG(196, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
 			} else {
-				if (yych <= ']') goto yy97;
-				if (yych <= '^') goto yy114;
-				if (yych <= '_') goto yy113;
-				goto yy97;
+				if (yych <= '9') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					goto yy159;
+				} else {
+					if (yych == ';') goto yy161;
+					if (yych <= '<') goto yy136;
+					goto yy161;
+				}
 			}
 		} else {
-			if (yych <= '{') {
-				if (yych == 'l') goto yy147;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy136;
+					if (yych == 'L') goto yy201;
+					goto yy159;
+				} else {
+					if (yych <= ']') goto yy136;
+					if (yych <= '^') goto yy161;
+					if (yych <= '_') goto yy159;
+					goto yy136;
+				}
 			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
+				if (yych <= '{') {
+					if (yych == 'l') goto yy201;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
+				}
 			}
 		}
-	}
-yy144:
-	YYDEBUG(144, yych);
-	yyaccept = 3;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_VALUE[0+yych] & 32) goto yy113;
-	if (yych <= ')') {
-		if (yych <= '\f') {
-			if (yych <= 0x08) {
-				if (yych <= 0x00) goto yy131;
-				goto yy97;
-			} else {
-				if (yych <= '\t') goto yy141;
-				if (yych <= '\n') goto yy131;
-				goto yy97;
-			}
-		} else {
-			if (yych <= ' ') {
-				if (yych <= '\r') goto yy131;
-				if (yych <= 0x1F) goto yy97;
-				goto yy141;
-			} else {
-				if (yych <= '"') goto yy131;
-				if (yych <= '%') goto yy97;
-				goto yy131;
-			}
+yy197:
+		YYDEBUG(197, *YYCURSOR);
+		yyaccept = 3;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 32) {
+			goto yy159;
 		}
-	} else {
-		if (yych <= ']') {
-			if (yych <= ';') {
-				if (yych <= ':') goto yy97;
-				goto yy131;
+		if (yych <= ')') {
+			if (yych <= '\f') {
+				if (yych <= 0x08) {
+					if (yych <= 0x00) goto yy181;
+					goto yy136;
+				} else {
+					if (yych <= '\t') goto yy193;
+					if (yych <= '\n') goto yy181;
+					goto yy136;
+				}
 			} else {
-				if (yych == '=') goto yy131;
-				goto yy97;
+				if (yych <= ' ') {
+					if (yych <= '\r') goto yy181;
+					if (yych <= 0x1F) goto yy136;
+					goto yy193;
+				} else {
+					if (yych <= '"') goto yy181;
+					if (yych <= '%') goto yy136;
+					goto yy181;
+				}
 			}
 		} else {
-			if (yych <= '|') {
-				if (yych <= '^') goto yy131;
-				if (yych <= '{') goto yy97;
-				goto yy131;
+			if (yych <= ']') {
+				if (yych <= ';') {
+					if (yych <= ':') goto yy136;
+					goto yy181;
+				} else {
+					if (yych == '=') goto yy181;
+					goto yy136;
+				}
 			} else {
-				if (yych == '~') goto yy131;
-				goto yy97;
-			}
-		}
-	}
-yy145:
-	YYDEBUG(145, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '\t') goto yy145;
-	if (yych == ' ') goto yy145;
-	goto yy135;
-yy146:
-	YYDEBUG(146, yych);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych <= '"') {
-			if (yych <= '\n') {
-				if (yych <= 0x00) goto yy114;
-				if (yych <= 0x08) goto yy97;
-				goto yy114;
-			} else {
-				if (yych == '\r') goto yy114;
-				if (yych <= 0x1F) goto yy97;
-				goto yy114;
-			}
-		} else {
-			if (yych <= '9') {
-				if (yych <= '%') goto yy97;
-				if (yych <= ')') goto yy114;
-				if (yych <= '/') goto yy97;
-				goto yy113;
-			} else {
-				if (yych == ';') goto yy114;
-				if (yych <= '<') goto yy97;
-				goto yy114;
+				if (yych <= '|') {
+					if (yych <= '^') goto yy181;
+					if (yych <= '{') goto yy136;
+					goto yy181;
+				} else {
+					if (yych == '~') goto yy181;
+					goto yy136;
+				}
 			}
 		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= 'Z') {
-				if (yych <= '@') goto yy97;
-				if (yych == 'E') goto yy134;
-				goto yy113;
+yy198:
+		YYDEBUG(198, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(199, *YYCURSOR);
+		if (yych == '\t') goto yy198;
+		if (yych == ' ') goto yy198;
+		goto yy185;
+yy200:
+		YYDEBUG(200, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych <= '"') {
+				if (yych <= '\n') {
+					if (yych <= 0x00) goto yy161;
+					if (yych <= 0x08) goto yy136;
+					goto yy161;
+				} else {
+					if (yych == '\r') goto yy161;
+					if (yych <= 0x1F) goto yy136;
+					goto yy161;
+				}
 			} else {
-				if (yych <= ']') goto yy97;
-				if (yych <= '^') goto yy114;
-				if (yych <= '_') goto yy113;
-				goto yy97;
+				if (yych <= '9') {
+					if (yych <= '%') goto yy136;
+					if (yych <= ')') goto yy161;
+					if (yych <= '/') goto yy136;
+					goto yy159;
+				} else {
+					if (yych == ';') goto yy161;
+					if (yych <= '<') goto yy136;
+					goto yy161;
+				}
 			}
 		} else {
-			if (yych <= '{') {
-				if (yych == 'e') goto yy134;
-				if (yych <= 'z') goto yy113;
-				goto yy97;
+			if (yych <= '`') {
+				if (yych <= 'Z') {
+					if (yych <= '@') goto yy136;
+					if (yych == 'E') goto yy184;
+					goto yy159;
+				} else {
+					if (yych <= ']') goto yy136;
+					if (yych <= '^') goto yy161;
+					if (yych <= '_') goto yy159;
+					goto yy136;
+				}
 			} else {
-				if (yych == '}') goto yy97;
-				if (yych <= '~') goto yy114;
-				goto yy97;
+				if (yych <= '{') {
+					if (yych == 'e') goto yy184;
+					if (yych <= 'z') goto yy159;
+					goto yy136;
+				} else {
+					if (yych == '}') goto yy136;
+					if (yych <= '~') goto yy161;
+					goto yy136;
+				}
 			}
 		}
-	}
-yy147:
-	YYDEBUG(147, yych);
-	yyaccept = 5;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_VALUE[0+yych] & 32) goto yy113;
-	if (yych <= ')') {
-		if (yych <= '\f') {
-			if (yych <= 0x08) {
-				if (yych >= 0x01) goto yy97;
-			} else {
-				if (yych <= '\t') goto yy149;
-				if (yych >= '\v') goto yy97;
-			}
-		} else {
-			if (yych <= ' ') {
-				if (yych <= '\r') goto yy148;
-				if (yych <= 0x1F) goto yy97;
-				goto yy149;
-			} else {
-				if (yych <= '"') goto yy148;
-				if (yych <= '%') goto yy97;
-			}
+yy201:
+		YYDEBUG(201, *YYCURSOR);
+		yyaccept = 5;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 32) {
+			goto yy159;
 		}
-	} else {
-		if (yych <= ']') {
-			if (yych <= ';') {
-				if (yych <= ':') goto yy97;
+		if (yych <= ')') {
+			if (yych <= '\f') {
+				if (yych <= 0x08) {
+					if (yych >= 0x01) goto yy136;
+				} else {
+					if (yych <= '\t') goto yy203;
+					if (yych >= '\v') goto yy136;
+				}
 			} else {
-				if (yych != '=') goto yy97;
+				if (yych <= ' ') {
+					if (yych <= '\r') goto yy202;
+					if (yych <= 0x1F) goto yy136;
+					goto yy203;
+				} else {
+					if (yych <= '"') goto yy202;
+					if (yych <= '%') goto yy136;
+				}
 			}
 		} else {
-			if (yych <= '|') {
-				if (yych <= '^') goto yy148;
-				if (yych <= '{') goto yy97;
+			if (yych <= ']') {
+				if (yych <= ';') {
+					if (yych <= ':') goto yy136;
+				} else {
+					if (yych != '=') goto yy136;
+				}
 			} else {
-				if (yych != '~') goto yy97;
+				if (yych <= '|') {
+					if (yych <= '^') goto yy202;
+					if (yych <= '{') goto yy136;
+				} else {
+					if (yych != '~') goto yy136;
+				}
 			}
 		}
-	}
-yy148:
-	YYDEBUG(148, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy202:
+		YYDEBUG(202, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(NULL_NULL, "", 0);
 }
-yy149:
-	YYDEBUG(149, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '\t') goto yy149;
-	if (yych == ' ') goto yy149;
-	goto yy148;
+yy203:
+		YYDEBUG(203, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(204, *YYCURSOR);
+		if (yych == '\t') goto yy203;
+		if (yych == ' ') goto yy203;
+		goto yy202;
+	}
 /* *********************************** */
 yyc_ST_SECTION_RAW:
-	YYFILL(1);
-	yych = *YYCURSOR;
-	YYDEBUG(150, yych);
-	if (yybm_ST_SECTION_RAW[0+yych] & 64) goto yy151;
-	if (yych <= '\r') goto yy152;
-	goto yy153;
-yy151:
-	YYDEBUG(151, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_SECTION_RAW[0+yych] & 64) goto yy151;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
+	{
+		static const unsigned char yybm[] = {
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64, 192,   0,  64,  64,   0,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			192,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,   0,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+		};
+		YYDEBUG(205, *YYCURSOR);
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 64) {
+			goto yy207;
+		}
+		if (yych <= '\r') goto yy210;
+		goto yy212;
+yy207:
+		YYDEBUG(207, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(208, *YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy207;
+		}
+		YYDEBUG(209, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
 	RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-yy152:
-	YYDEBUG(152, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy210:
+		YYDEBUG(210, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(211, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	return 0;
 }
-yy153:
-	YYDEBUG(153, yych);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yybm_ST_SECTION_RAW[0+yych] & 128) goto yy153;
-	if (yych <= 0x08) goto yy154;
-	if (yych <= '\n') goto yy155;
-	if (yych == '\r') goto yy156;
-yy154:
-	YYDEBUG(154, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* End of section */
+yy212:
+		YYDEBUG(212, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(213, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy212;
+		}
+		if (yych <= 0x08) goto yy214;
+		if (yych <= '\n') goto yy215;
+		if (yych == '\r') goto yy216;
+yy214:
+		YYDEBUG(214, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* End of section */
 	BEGIN(INITIAL);
 	SCNG(lineno)++;
 	return ']';
 }
-yy155:
-	YYDEBUG(155, yych);
-	++YYCURSOR;
-	goto yy154;
-yy156:
-	YYDEBUG(156, yych);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy155;
-	goto yy154;
+yy215:
+		YYDEBUG(215, *YYCURSOR);
+		++YYCURSOR;
+		goto yy214;
+yy216:
+		YYDEBUG(216, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy215;
+		goto yy214;
+	}
 /* *********************************** */
 yyc_ST_DOUBLE_QUOTES:
-	YYFILL(2);
-	yych = *YYCURSOR;
-	YYDEBUG(157, yych);
-	if (yych == '"') goto yy159;
-	if (yych == '$') goto yy160;
-	++YYCURSOR;
-yy158:
-	YYDEBUG(158, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Escape double quoted string contents */
+	{
+		static const unsigned char yybm[] = {
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0, 128,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			128,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+		};
+		YYDEBUG(217, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yych == '"') goto yy221;
+		if (yych == '$') goto yy224;
+		YYDEBUG(219, *YYCURSOR);
+		++YYCURSOR;
+yy220:
+		YYDEBUG(220, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Escape double quoted string contents */
 	if (YYCURSOR > YYLIMIT) {
 		return 0;
 	}
@@ -3351,43 +3450,91 @@
 	zend_ini_escape_string(ini_lval, yytext, yyleng, '"');
 	return TC_QUOTED_STRING;
 }
-yy159:
-	YYDEBUG(159, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_DOUBLE_QUOTES[0+yych] & 128) goto yy159;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Double quoted '"' string ends */
+yy221:
+		YYDEBUG(221, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(222, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy221;
+		}
+		YYDEBUG(223, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Double quoted '"' string ends */
 	yy_pop_state();
 	return '"';
 }
-yy160:
-	YYDEBUG(160, yych);
-	yych = *++YYCURSOR;
-	if (yych != '{') goto yy158;
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Variable start */
+yy224:
+		YYDEBUG(224, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych != '{') goto yy220;
+		YYDEBUG(225, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(226, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Variable start */
 	yy_push_state(ST_VARNAME);
 	return TC_DOLLAR_CURLY;
 }
+	}
 /* *********************************** */
 yyc_ST_VARNAME:
-	YYFILL(1);
-	yych = *YYCURSOR;
-	YYDEBUG(161, yych);
-	if (yybm_ST_VARNAME[0+yych] & 128) goto yy162;
-	if (yych == '}') goto yy164;
-	goto yy163;
-yy162:
-	YYDEBUG(162, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VARNAME[0+yych] & 128) goto yy162;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Variable name */
+	{
+		static const unsigned char yybm[] = {
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128,   0,   0, 128, 128,   0, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128,   0,   0, 128,   0, 128,   0, 128, 
+			  0,   0, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0, 128,   0, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0, 128, 128,   0, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+		};
+		YYDEBUG(227, *YYCURSOR);
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 128) {
+			goto yy229;
+		}
+		if (yych == '}') goto yy234;
+		goto yy232;
+yy229:
+		YYDEBUG(229, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(230, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy229;
+		}
+		YYDEBUG(231, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Variable name */
 	/* Eat leading whitespace */
 	EAT_LEADING_WHITESPACE();
 
@@ -3396,57 +3543,97 @@
 
 	RETURN_TOKEN(TC_VARNAME, yytext, yyleng);
 }
-yy163:
-	YYDEBUG(163, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy232:
+		YYDEBUG(232, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(233, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	return 0;
 }
-yy164:
-	YYDEBUG(164, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Variable end */
+yy234:
+		YYDEBUG(234, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(235, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Variable end */
 	yy_pop_state();
 	return '}';
 }
+	}
 /* *********************************** */
 yyc_ST_RAW:
-	YYFILL(3);
-	yych = *YYCURSOR;
-	YYDEBUG(165, yych);
-	if (yych <= '\f') {
-		if (yych <= 0x08) {
-			if (yych >= 0x01) goto yy166;
-		} else {
-			if (yych <= '\t') goto yy168;
-			if (yych <= '\n') goto yy169;
-			goto yy166;
-		}
-	} else {
-		if (yych <= ' ') {
-			if (yych <= '\r') goto yy171;
-			if (yych <= 0x1F) goto yy166;
-			goto yy168;
+	{
+		static const unsigned char yybm[] = {
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64, 192,   0,  64,  64,   0,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			192,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+		};
+		YYDEBUG(236, *YYCURSOR);
+		YYFILL(3);
+		yych = *YYCURSOR;
+		if (yych <= '\f') {
+			if (yych <= 0x08) {
+				if (yych >= 0x01) goto yy240;
+			} else {
+				if (yych <= '\t') goto yy242;
+				if (yych <= '\n') goto yy243;
+				goto yy240;
+			}
 		} else {
-			if (yych == ';') goto yy172;
-			goto yy166;
+			if (yych <= ' ') {
+				if (yych <= '\r') goto yy245;
+				if (yych <= 0x1F) goto yy240;
+				goto yy242;
+			} else {
+				if (yych == ';') goto yy246;
+				goto yy240;
+			}
 		}
-	}
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* End of option value (if EOF is reached before EOL */
+		YYDEBUG(238, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(239, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* End of option value (if EOF is reached before EOL */
 	BEGIN(INITIAL);
 	return END_OF_LINE;
 }
-yy166:
-	YYDEBUG(166, yych);
-	++YYCURSOR;
-yy167:
-	YYDEBUG(167, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
+yy240:
+		YYDEBUG(240, *YYCURSOR);
+		++YYCURSOR;
+yy241:
+		YYDEBUG(241, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Raw value, only used when SCNG(scanner_mode) == ZEND_INI_SCANNER_RAW. */
 	unsigned char *sc = NULL;
 	EAT_LEADING_WHITESPACE();
 	while (YYCURSOR < YYLIMIT) {
@@ -3489,85 +3676,91 @@
 
 	RETURN_TOKEN(TC_RAW, yytext, yyleng);
 }
-yy168:
-	YYDEBUG(168, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '\r') {
-		if (yych <= 0x08) goto yy167;
-		if (yych <= '\n') goto yy174;
-		if (yych <= '\f') goto yy167;
-		goto yy174;
-	} else {
-		if (yych <= ' ') {
-			if (yych <= 0x1F) goto yy167;
-			goto yy174;
+yy242:
+		YYDEBUG(242, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\r') {
+			if (yych <= 0x08) goto yy241;
+			if (yych <= '\n') goto yy249;
+			if (yych <= '\f') goto yy241;
+			goto yy249;
 		} else {
-			if (yych == ';') goto yy174;
-			goto yy167;
+			if (yych <= ' ') {
+				if (yych <= 0x1F) goto yy241;
+				goto yy249;
+			} else {
+				if (yych == ';') goto yy249;
+				goto yy241;
+			}
 		}
-	}
-yy169:
-	YYDEBUG(169, yych);
-	++YYCURSOR;
-yy170:
-	YYDEBUG(170, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* End of option value */
+yy243:
+		YYDEBUG(243, *YYCURSOR);
+		++YYCURSOR;
+yy244:
+		YYDEBUG(244, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* End of option value */
 	BEGIN(INITIAL);
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-yy171:
-	YYDEBUG(171, yych);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy169;
-	goto yy170;
-yy172:
-	YYDEBUG(172, yych);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yybm_ST_RAW[0+yych] & 64) goto yy172;
-	if (yych <= '\n') goto yy176;
-	goto yy178;
-yy173:
-	YYDEBUG(173, yych);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-yy174:
-	YYDEBUG(174, yych);
-	if (yybm_ST_RAW[0+yych] & 128) goto yy173;
-	if (yych <= '\f') {
-		if (yych <= 0x08) goto yy175;
-		if (yych <= '\n') goto yy169;
-	} else {
-		if (yych <= '\r') goto yy171;
-		if (yych == ';') goto yy172;
-	}
-yy175:
-	YYDEBUG(175, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy245:
+		YYDEBUG(245, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy243;
+		goto yy244;
+yy246:
+		YYDEBUG(246, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(247, *YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy246;
+		}
+		if (yych <= '\n') goto yy251;
+		goto yy253;
+yy248:
+		YYDEBUG(248, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+yy249:
+		YYDEBUG(249, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy248;
+		}
+		if (yych <= '\f') {
+			if (yych <= 0x08) goto yy250;
+			if (yych <= '\n') goto yy243;
+		} else {
+			if (yych <= '\r') goto yy245;
+			if (yych == ';') goto yy246;
+		}
+yy250:
+		YYDEBUG(250, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	/* eat whitespace */
 	goto restart;
 }
-yy176:
-	YYDEBUG(176, yych);
-	++YYCURSOR;
-yy177:
-	YYDEBUG(177, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Comment */
+yy251:
+		YYDEBUG(251, *YYCURSOR);
+		++YYCURSOR;
+yy252:
+		YYDEBUG(252, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Comment */
 	BEGIN(INITIAL);
 	SCNG(lineno)++;
 	return END_OF_LINE;
 }
-yy178:
-	YYDEBUG(178, yych);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy176;
-	goto yy177;
+yy253:
+		YYDEBUG(253, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy251;
+		goto yy252;
+	}
 }
 
 }
diff -Nru php8.2-8.2.29/Zend/zend_ini_scanner_defs.h php8.2-8.2.30/Zend/zend_ini_scanner_defs.h
--- php8.2-8.2.29/Zend/zend_ini_scanner_defs.h	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/Zend/zend_ini_scanner_defs.h	2025-12-16 17:18:12.000000000 +0000
@@ -1,4 +1,4 @@
-/* Generated by re2c 4.0 */
+/* Generated by re2c 2.0.3 */
 
 enum YYCONDTYPE {
 	yycINITIAL,
@@ -8,5 +8,5 @@
 	yycST_SECTION_RAW,
 	yycST_DOUBLE_QUOTES,
 	yycST_VARNAME,
-	yycST_RAW
+	yycST_RAW,
 };
diff -Nru php8.2-8.2.29/Zend/zend_language_parser.c php8.2-8.2.30/Zend/zend_language_parser.c
--- php8.2-8.2.29/Zend/zend_language_parser.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/Zend/zend_language_parser.c	2025-12-16 17:18:12.000000000 +0000
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.8.2.  */
+/* A Bison parser, made by GNU Bison 3.7.5.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -46,10 +46,10 @@
    USER NAME SPACE" below.  */
 
 /* Identify Bison output, and Bison version.  */
-#define YYBISON 30802
+#define YYBISON 30705
 
 /* Bison version string.  */
-#define YYBISON_VERSION "3.8.2"
+#define YYBISON_VERSION "3.7.5"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -629,18 +629,12 @@
 # define YY_USE(E) /* empty */
 #endif
 
+#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__
-# if __GNUC__ * 100 + __GNUC_MINOR__ < 407
-#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
-    _Pragma ("GCC diagnostic push")                                     \
-    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")
-# else
-#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                            \
     _Pragma ("GCC diagnostic push")                                     \
     _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")              \
     _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# endif
 # define YY_IGNORE_MAYBE_UNINITIALIZED_END      \
     _Pragma ("GCC diagnostic pop")
 #else
@@ -869,7 +863,7 @@
 };
 
 #if ZENDDEBUG
-/* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_int16 yyrline[] =
 {
        0,   296,   296,   300,   300,   300,   300,   300,   300,   300,
@@ -1048,6 +1042,32 @@
 }
 #endif
 
+#ifdef YYPRINT
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
+static const yytype_int16 yytoknum[] =
+{
+       0,   256,   257,   258,    61,    63,    58,   124,    94,    60,
+      62,    46,    43,    45,    42,    47,    37,    33,   126,    64,
+     259,   260,   261,   262,   263,   264,   265,   266,   267,   268,
+     269,   270,   271,   272,   273,   274,   275,   276,   277,   278,
+     279,   280,   281,   282,   283,   284,   285,   286,   287,   288,
+     289,   290,   291,   292,   293,   294,   295,   296,   297,   298,
+     299,   300,   301,   302,   303,   304,   305,   306,   307,   308,
+     309,   310,   311,   312,   313,   314,   315,   316,   317,   318,
+     319,   320,   321,   322,   323,   324,   325,   326,   327,   328,
+     329,   330,   331,   332,   333,   334,   335,   336,   337,   338,
+     339,   340,   341,   342,   343,   344,   345,   346,   347,   348,
+     349,   350,   351,   352,   353,   354,   355,   356,   357,   358,
+     359,   360,   361,   362,   363,   364,   365,   366,   367,   368,
+     369,   370,   371,   372,   373,   374,   375,   376,   377,   378,
+     379,   380,   381,   382,   383,   384,   385,   386,   387,   388,
+     389,   390,   391,   392,   393,   394,   395,   396,   397,   398,
+     399,   400,   401,   402,   403,   404,   405,   406,    44,    93,
+      40,    41,    59,   123,   125,    91,    96,    34,    36
+};
+#endif
+
 #define YYPACT_NINF (-900)
 
 #define yypact_value_is_default(Yyn) \
@@ -1058,8 +1078,8 @@
 #define yytable_value_is_error(Yyn) \
   ((Yyn) == YYTABLE_NINF)
 
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
 static const yytype_int16 yypact[] =
 {
     -900,    96,  3527,  -900,  7034,  7034,  7034,  7034,  7034,  -900,
@@ -1176,9 +1196,9 @@
     -900,  -900,  -900,  5531,  -900,  -900
 };
 
-/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
-   Performed when YYTABLE does not specify something else to do.  Zero
-   means the default is an error.  */
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
 static const yytype_int16 yydefact[] =
 {
       86,     0,     2,     1,     0,     0,     0,     0,     0,   494,
@@ -1295,7 +1315,7 @@
      339,   144,   462,     0,   317,   340
 };
 
-/* YYPGOTO[NTERM-NUM].  */
+  /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
     -900,  -900,   -20,  -900,  -101,    24,  -450,  -900,   -22,  -174,
@@ -1318,7 +1338,7 @@
      692,  -900,  -900,  -900,   452
 };
 
-/* YYDEFGOTO[NTERM-NUM].  */
+  /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
        0,     1,   288,   289,   325,   487,     2,   291,   734,   187,
@@ -1341,9 +1361,9 @@
      318,   679,   127,   495,   496
 };
 
-/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule whose
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
       92,   112,   384,   300,   300,    93,    95,   150,   301,   301,
@@ -3214,8 +3234,8 @@
      102,   103,   104,   105,   106,   107,   108,   109,   110,   111
 };
 
-/* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of
-   state STATE-NUM.  */
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
 static const yytype_int16 yystos[] =
 {
        0,   180,   185,     0,    12,    13,    17,    18,    19,    21,
@@ -3332,7 +3352,7 @@
      172,   173,   293,   209,   315,   174
 };
 
-/* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM.  */
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_int16 yyr1[] =
 {
        0,   179,   180,   181,   181,   181,   181,   181,   181,   181,
@@ -3397,7 +3417,7 @@
      353
 };
 
-/* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM.  */
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
 static const yytype_int8 yyr2[] =
 {
        0,     2,     1,     1,     1,     1,     1,     1,     1,     1,
@@ -3471,7 +3491,6 @@
 #define YYACCEPT        goto yyacceptlab
 #define YYABORT         goto yyabortlab
 #define YYERROR         goto yyerrorlab
-#define YYNOMEM         goto yyexhaustedlab
 
 
 #define YYRECOVERING()  (!!yyerrstatus)
@@ -3512,7 +3531,10 @@
     YYFPRINTF Args;                             \
 } while (0)
 
-
+/* This macro is provided for backward compatibility. */
+# ifndef YY_LOCATION_PRINT
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 
 
 # define YY_SYMBOL_PRINT(Title, Kind, Value, Location)                    \
@@ -3539,6 +3561,10 @@
   YY_USE (yyoutput);
   if (!yyvaluep)
     return;
+# ifdef YYPRINT
+  if (yykind < YYNTOKENS)
+    YYPRINT (yyo, yytoknum[yykind], *yyvaluep);
+# endif
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   YY_USE (yykind);
   YY_IGNORE_MAYBE_UNINITIALIZED_END
@@ -4619,7 +4645,6 @@
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yychar = ZENDEMPTY; /* Cause a token to be read.  */
-
   goto yysetstate;
 
 
@@ -4645,7 +4670,7 @@
 
   if (yyss + yystacksize - 1 <= yyssp)
 #if !defined yyoverflow && !defined YYSTACK_RELOCATE
-    YYNOMEM;
+    goto yyexhaustedlab;
 #else
     {
       /* Get the current used size of the three stacks, in elements.  */
@@ -4673,7 +4698,7 @@
 # else /* defined YYSTACK_RELOCATE */
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-        YYNOMEM;
+        goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
         yystacksize = YYMAXDEPTH;
@@ -4684,7 +4709,7 @@
           YY_CAST (union yyalloc *,
                    YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize))));
         if (! yyptr)
-          YYNOMEM;
+          goto yyexhaustedlab;
         YYSTACK_RELOCATE (yyss_alloc, yyss);
         YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
@@ -4706,7 +4731,6 @@
     }
 #endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
 
-
   if (yystate == YYFINAL)
     YYACCEPT;
 
@@ -6966,7 +6990,7 @@
           }
         yyerror (yymsgp);
         if (yysyntax_error_status == YYENOMEM)
-          YYNOMEM;
+          goto yyexhaustedlab;
       }
     }
 
@@ -7002,7 +7026,6 @@
      label yyerrorlab therefore never appears in user code.  */
   if (0)
     YYERROR;
-  ++yynerrs;
 
   /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
@@ -7063,7 +7086,7 @@
 `-------------------------------------*/
 yyacceptlab:
   yyresult = 0;
-  goto yyreturnlab;
+  goto yyreturn;
 
 
 /*-----------------------------------.
@@ -7071,22 +7094,24 @@
 `-----------------------------------*/
 yyabortlab:
   yyresult = 1;
-  goto yyreturnlab;
+  goto yyreturn;
 
 
-/*-----------------------------------------------------------.
-| yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here.  |
-`-----------------------------------------------------------*/
+#if 1
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
 yyexhaustedlab:
   yyerror (YY_("memory exhausted"));
   yyresult = 2;
-  goto yyreturnlab;
+  goto yyreturn;
+#endif
 
 
-/*----------------------------------------------------------.
-| yyreturnlab -- parsing is finished, clean up and return.  |
-`----------------------------------------------------------*/
-yyreturnlab:
+/*-------------------------------------------------------.
+| yyreturn -- parsing is finished, clean up and return.  |
+`-------------------------------------------------------*/
+yyreturn:
   if (yychar != ZENDEMPTY)
     {
       /* Make sure we have latest lookahead translation.  See comments at
diff -Nru php8.2-8.2.29/Zend/zend_language_parser.h php8.2-8.2.30/Zend/zend_language_parser.h
--- php8.2-8.2.29/Zend/zend_language_parser.h	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/Zend/zend_language_parser.h	2025-12-16 17:18:12.000000000 +0000
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.8.2.  */
+/* A Bison parser, made by GNU Bison 3.7.5.  */
 
 /* Bison interface for Yacc-like parsers in C
 
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -228,8 +228,6 @@
 
 
 
-
 ZEND_API int zendparse (void);
 
-
 #endif /* !YY_ZEND_ZEND_ZEND_LANGUAGE_PARSER_H_INCLUDED  */
diff -Nru php8.2-8.2.29/Zend/zend_language_parser.output php8.2-8.2.30/Zend/zend_language_parser.output
--- php8.2-8.2.29/Zend/zend_language_parser.output	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/Zend/zend_language_parser.output	2025-12-16 17:18:12.000000000 +0000
@@ -103,7 +103,7 @@
    83           | semi_reserved
 
    84 top_statement_list: top_statement_list top_statement
-   85                   | ε
+   85                   | %empty
 
    86 namespace_declaration_name: identifier
    87                           | "namespaced name"
@@ -142,11 +142,11 @@
   111              | "'__halt_compiler'" '(' ')' ';'
   112              | "'namespace'" namespace_declaration_name ';'
 
-  113 $@1: ε
+  113 $@1: %empty
 
   114 top_statement: "'namespace'" namespace_declaration_name $@1 '{' top_statement_list '}'
 
-  115 $@2: ε
+  115 $@2: %empty
 
   116 top_statement: "'namespace'" $@2 '{' top_statement_list '}'
   117              | "'use'" mixed_group_use_declaration ';'
@@ -162,7 +162,7 @@
 
   125 mixed_group_use_declaration: legacy_namespace_name "'\\'" '{' inline_use_declarations possible_comma '}'
 
-  126 possible_comma: ε
+  126 possible_comma: %empty
   127               | ','
 
   128 inline_use_declarations: inline_use_declarations ',' inline_use_declaration
@@ -187,7 +187,7 @@
   141           | const_decl
 
   142 inner_statement_list: inner_statement_list inner_statement
-  143                     | ε
+  143                     | %empty
 
   144 inner_statement: statement
   145                | attributed_statement
@@ -213,7 +213,7 @@
   164          | "'foreach'" '(' expr "'as'" foreach_variable ')' foreach_statement
   165          | "'foreach'" '(' expr "'as'" foreach_variable "'=>'" foreach_variable ')' foreach_statement
 
-  166 $@3: ε
+  166 $@3: %empty
 
   167 statement: "'declare'" '(' const_list ')' $@3 declare_statement
   168          | ';'
@@ -221,16 +221,16 @@
   170          | "'goto'" "identifier" ';'
   171          | "identifier" ':'
 
-  172 catch_list: ε
+  172 catch_list: %empty
   173           | catch_list "'catch'" '(' catch_name_list optional_variable ')' '{' inner_statement_list '}'
 
   174 catch_name_list: class_name
   175                | catch_name_list '|' class_name
 
-  176 optional_variable: ε
+  176 optional_variable: %empty
   177                  | "variable"
 
-  178 finally_statement: ε
+  178 finally_statement: %empty
   179                  | "'finally'" '{' inner_statement_list '}'
 
   180 unset_variables: unset_variable
@@ -243,17 +243,17 @@
 
   185 function_declaration_statement: function returns_ref function_name backup_doc_comment '(' parameter_list ')' return_type backup_fn_flags '{' inner_statement_list '}' backup_fn_flags
 
-  186 is_reference: ε
+  186 is_reference: %empty
   187             | "'&'"
 
-  188 is_variadic: ε
+  188 is_variadic: %empty
   189            | "'...'"
 
-  190 @4: ε
+  190 @4: %empty
 
   191 class_declaration_statement: class_modifiers "'class'" @4 "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list '}'
 
-  192 @5: ε
+  192 @5: %empty
 
   193 class_declaration_statement: "'class'" @5 "identifier" extends_from implements_list backup_doc_comment '{' class_statement_list '}'
 
@@ -264,33 +264,33 @@
   197               | "'final'"
   198               | "'readonly'"
 
-  199 @6: ε
+  199 @6: %empty
 
   200 trait_declaration_statement: "'trait'" @6 "identifier" backup_doc_comment '{' class_statement_list '}'
 
-  201 @7: ε
+  201 @7: %empty
 
   202 interface_declaration_statement: "'interface'" @7 "identifier" interface_extends_list backup_doc_comment '{' class_statement_list '}'
 
-  203 @8: ε
+  203 @8: %empty
 
   204 enum_declaration_statement: "'enum'" @8 "identifier" enum_backing_type implements_list backup_doc_comment '{' class_statement_list '}'
 
-  205 enum_backing_type: ε
+  205 enum_backing_type: %empty
   206                  | ':' type_expr
 
   207 enum_case: "'case'" backup_doc_comment identifier enum_case_expr ';'
 
-  208 enum_case_expr: ε
+  208 enum_case_expr: %empty
   209               | '=' expr
 
-  210 extends_from: ε
+  210 extends_from: %empty
   211             | "'extends'" class_name
 
-  212 interface_extends_list: ε
+  212 interface_extends_list: %empty
   213                       | "'extends'" class_name_list
 
-  214 implements_list: ε
+  214 implements_list: %empty
   215                | "'implements'" class_name_list
 
   216 foreach_variable: variable
@@ -312,7 +312,7 @@
   228                 | ':' case_list "'endswitch'" ';'
   229                 | ':' ';' case_list "'endswitch'" ';'
 
-  230 case_list: ε
+  230 case_list: %empty
   231          | case_list "'case'" expr case_separator inner_statement_list
   232          | case_list "'default'" case_separator inner_statement_list
 
@@ -321,7 +321,7 @@
 
   235 match: "'match'" '(' expr ')' '{' match_arm_list '}'
 
-  236 match_arm_list: ε
+  236 match_arm_list: %empty
   237               | non_empty_match_arm_list possible_comma
 
   238 non_empty_match_arm_list: match_arm
@@ -349,7 +349,7 @@
   253            | alt_if_stmt_without_else "'else'" ':' inner_statement_list "'endif'" ';'
 
   254 parameter_list: non_empty_parameter_list possible_comma
-  255               | ε
+  255               | %empty
 
   256 non_empty_parameter_list: attributed_parameter
   257                         | non_empty_parameter_list ',' attributed_parameter
@@ -357,7 +357,7 @@
   258 attributed_parameter: attributes parameter
   259                     | parameter
 
-  260 optional_property_modifiers: ε
+  260 optional_property_modifiers: %empty
   261                            | optional_property_modifiers property_modifier
 
   262 property_modifier: "'public'"
@@ -368,7 +368,7 @@
   266 parameter: optional_property_modifiers optional_type_without_static is_reference is_variadic "variable" backup_doc_comment
   267          | optional_property_modifiers optional_type_without_static is_reference is_variadic "variable" backup_doc_comment '=' expr
 
-  268 optional_type_without_static: ε
+  268 optional_type_without_static: %empty
   269                             | type_expr_without_static
 
   270 type_expr: type
@@ -406,7 +406,7 @@
   293 intersection_type_without_static: type_without_static "amp" type_without_static
   294                                 | intersection_type_without_static "amp" type_without_static
 
-  295 return_type: ε
+  295 return_type: %empty
   296            | ':' type_expr
 
   297 argument_list: '(' ')'
@@ -432,7 +432,7 @@
   311           | "variable" '=' expr
 
   312 class_statement_list: class_statement_list class_statement
-  313                     | ε
+  313                     | %empty
 
   314 attributed_class_statement: variable_modifiers optional_type_without_static property_list ';'
   315                           | method_modifiers "'const'" class_const_list ';'
@@ -474,7 +474,7 @@
   340 variable_modifiers: non_empty_member_modifiers
   341                   | "'var'"
 
-  342 method_modifiers: ε
+  342 method_modifiers: %empty
   343                 | non_empty_member_modifiers
 
   344 non_empty_member_modifiers: member_modifier
@@ -506,13 +506,13 @@
 
   363 echo_expr: expr
 
-  364 for_exprs: ε
+  364 for_exprs: %empty
   365          | non_empty_for_exprs
 
   366 non_empty_for_exprs: non_empty_for_exprs ',' expr
   367                    | expr
 
-  368 @9: ε
+  368 @9: %empty
 
   369 anonymous_class: "'class'" @9 ctor_arguments extends_from implements_list backup_doc_comment '{' class_statement_list '}'
 
@@ -611,16 +611,16 @@
 
   459 function: "'function'"
 
-  460 backup_doc_comment: ε
+  460 backup_doc_comment: %empty
 
-  461 backup_fn_flags: ε
+  461 backup_fn_flags: %empty
 
-  462 backup_lex_pos: ε
+  462 backup_lex_pos: %empty
 
-  463 returns_ref: ε
+  463 returns_ref: %empty
   464            | ampersand
 
-  465 lexical_vars: ε
+  465 lexical_vars: %empty
   466             | "'use'" '(' lexical_var_list possible_comma ')'
 
   467 lexical_var_list: lexical_var_list ',' lexical_var
@@ -634,7 +634,7 @@
   473              | class_name "'::'" member_name argument_list
   474              | variable_class_name "'::'" member_name argument_list
 
-  475 @10: ε
+  475 @10: %empty
 
   476 function_call: callable_expr @10 argument_list
 
@@ -645,14 +645,14 @@
   480                     | new_variable
   481                     | '(' expr ')'
 
-  482 exit_expr: ε
+  482 exit_expr: %empty
   483          | '(' optional_expr ')'
 
-  484 backticks_expr: ε
+  484 backticks_expr: %empty
   485               | "string content"
   486               | encaps_list
 
-  487 ctor_arguments: ε
+  487 ctor_arguments: %empty
   488               | argument_list
 
   489 dereferenceable_scalar: "'array'" '(' array_pair_list ')'
@@ -682,7 +682,7 @@
   510 class_constant: class_name "'::'" identifier
   511               | variable_class_name "'::'" identifier
 
-  512 optional_expr: ε
+  512 optional_expr: %empty
   513              | expr
 
   514 variable_class_name: fully_dereferenceable
@@ -736,7 +736,7 @@
 
   552 array_pair_list: non_empty_array_pair_list
 
-  553 possible_array_pair: ε
+  553 possible_array_pair: %empty
   554                    | array_pair
 
   555 non_empty_array_pair_list: non_empty_array_pair_list ',' possible_array_pair
diff -Nru php8.2-8.2.29/Zend/zend_language_scanner.c php8.2-8.2.30/Zend/zend_language_scanner.c
--- php8.2-8.2.29/Zend/zend_language_scanner.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/Zend/zend_language_scanner.c	2025-12-16 17:18:12.000000000 +0000
@@ -1,4 +1,4 @@
-/* Generated by re2c 4.0 */
+/* Generated by re2c 2.0.3 */
 /*
    +----------------------------------------------------------------------+
    | Zend Engine                                                          |
@@ -1360,288 +1360,22 @@
 {
 	YYCTYPE yych;
 	unsigned int yyaccept = 0;
-	static const unsigned char yybm_ST_IN_SCRIPTING[256] = {
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,  18,   2,   0,   0,   2,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		 18,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		236, 236, 204, 204, 204, 204, 204, 204,
-		140, 140,   0,   0,   0,   0,   0,   0,
-		  0, 136, 136, 136, 136, 136, 136,   8,
-		  8,   8,   8,   8,   8,   8,   8,   8,
-		  8,   8,   8,   8,   8,   8,   8,   8,
-		  8,   8,   8,   0,   0,   0,   0,   8,
-		  0, 136, 136, 136, 136, 136, 136,   8,
-		  8,   8,   8,   8,   8,   8,   8,   8,
-		  8,   8,   8,   8,   8,   8,   8,   8,
-		  8,   8,   8,   0,   0,   0,   0,   0,
-		  8,   8,   8,   8,   8,   8,   8,   8,
-		  8,   8,   8,   8,   8,   8,   8,   8,
-		  8,   8,   8,   8,   8,   8,   8,   8,
-		  8,   8,   8,   8,   8,   8,   8,   8,
-		  8,   8,   8,   8,   8,   8,   8,   8,
-		  8,   8,   8,   8,   8,   8,   8,   8,
-		  8,   8,   8,   8,   8,   8,   8,   8,
-		  8,   8,   8,   8,   8,   8,   8,   8,
-		  8,   8,   8,   8,   8,   8,   8,   8,
-		  8,   8,   8,   8,   8,   8,   8,   8,
-		  8,   8,   8,   8,   8,   8,   8,   8,
-		  8,   8,   8,   8,   8,   8,   8,   8,
-		  8,   8,   8,   8,   8,   8,   8,   8,
-		  8,   8,   8,   8,   8,   8,   8,   8,
-		  8,   8,   8,   8,   8,   8,   8,   8,
-		  8,   8,   8,   8,   8,   8,   8,   8
-	};
-	static const unsigned char yybm_ST_LOOKING_FOR_PROPERTY[256] = {
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,  64,  64,   0,   0,  64,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		 64,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128,   0,   0,   0,   0,   0,   0,
-		  0, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128,   0,   0,   0,   0, 128,
-		  0, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128,   0,   0,   0,   0,   0,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128
-	};
-	static const unsigned char yybm_ST_BACKQUOTE[256] = {
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128,   0,   0,   0,   0,   0,   0,
-		  0, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128,   0,   0,   0,   0, 128,
-		  0, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128,   0,   0,   0,   0,   0,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128
-	};
-	static const unsigned char yybm_ST_DOUBLE_QUOTES[256] = {
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128,   0,   0,   0,   0,   0,   0,
-		  0, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128,   0,   0,   0,   0, 128,
-		  0, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128,   0,   0,   0,   0,   0,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128
-	};
-	static const unsigned char yybm_ST_HEREDOC[256] = {
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128,   0,   0,   0,   0,   0,   0,
-		  0, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128,   0,   0,   0,   0, 128,
-		  0, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128,   0,   0,   0,   0,   0,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128
-	};
-	static const unsigned char yybm_ST_LOOKING_FOR_VARNAME[256] = {
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128,   0,   0,   0,   0,   0,   0,
-		  0, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128,   0,   0,   0,   0, 128,
-		  0, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128,   0,   0,   0,   0,   0,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128
-	};
-	static const unsigned char yybm_ST_VAR_OFFSET[256] = {
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		248, 248, 216, 216, 216, 216, 216, 216,
-		152, 152,   0,   0,   0,   0,   0,   0,
-		  0, 144, 144, 144, 144, 144, 144,  16,
-		 16,  16,  16,  16,  16,  16,  16,  16,
-		 16,  16,  16,  16,  16,  16,  16,  16,
-		 16,  16,  16,   0,   0,   0,   0,  16,
-		  0, 144, 144, 144, 144, 144, 144,  16,
-		 16,  16,  16,  16,  16,  16,  16,  16,
-		 16,  16,  16,  16,  16,  16,  16,  16,
-		 16,  16,  16,   0,   0,   0,   0,   0,
-		 16,  16,  16,  16,  16,  16,  16,  16,
-		 16,  16,  16,  16,  16,  16,  16,  16,
-		 16,  16,  16,  16,  16,  16,  16,  16,
-		 16,  16,  16,  16,  16,  16,  16,  16,
-		 16,  16,  16,  16,  16,  16,  16,  16,
-		 16,  16,  16,  16,  16,  16,  16,  16,
-		 16,  16,  16,  16,  16,  16,  16,  16,
-		 16,  16,  16,  16,  16,  16,  16,  16,
-		 16,  16,  16,  16,  16,  16,  16,  16,
-		 16,  16,  16,  16,  16,  16,  16,  16,
-		 16,  16,  16,  16,  16,  16,  16,  16,
-		 16,  16,  16,  16,  16,  16,  16,  16,
-		 16,  16,  16,  16,  16,  16,  16,  16,
-		 16,  16,  16,  16,  16,  16,  16,  16,
-		 16,  16,  16,  16,  16,  16,  16,  16,
-		 16,  16,  16,  16,  16,  16,  16,  16
-	};
-	static const unsigned char yybm_SHEBANG[256] = {
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128,   0, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128
-	};
 	if (YYGETCONDITION() < 5) {
 		if (YYGETCONDITION() < 2) {
-			if (YYGETCONDITION() < 1) goto yyc_ST_IN_SCRIPTING;
-			else goto yyc_ST_LOOKING_FOR_PROPERTY;
+			if (YYGETCONDITION() < 1) {
+				goto yyc_ST_IN_SCRIPTING;
+			} else {
+				goto yyc_ST_LOOKING_FOR_PROPERTY;
+			}
 		} else {
 			if (YYGETCONDITION() < 3) {
 				goto yyc_ST_BACKQUOTE;
 			} else {
-				if (YYGETCONDITION() < 4) goto yyc_ST_DOUBLE_QUOTES;
-				else goto yyc_ST_HEREDOC;
+				if (YYGETCONDITION() < 4) {
+					goto yyc_ST_DOUBLE_QUOTES;
+				} else {
+					goto yyc_ST_HEREDOC;
+				}
 			}
 		}
 	} else {
@@ -1649,25 +1383,68 @@
 			if (YYGETCONDITION() < 6) {
 				goto yyc_ST_LOOKING_FOR_VARNAME;
 			} else {
-				if (YYGETCONDITION() < 7) goto yyc_ST_VAR_OFFSET;
-				else goto yyc_SHEBANG;
+				if (YYGETCONDITION() < 7) {
+					goto yyc_ST_VAR_OFFSET;
+				} else {
+					goto yyc_SHEBANG;
+				}
 			}
 		} else {
 			if (YYGETCONDITION() < 9) {
 				goto yyc_INITIAL;
 			} else {
-				if (YYGETCONDITION() < 10) goto yyc_ST_END_HEREDOC;
-				else goto yyc_ST_NOWDOC;
+				if (YYGETCONDITION() < 10) {
+					goto yyc_ST_END_HEREDOC;
+				} else {
+					goto yyc_ST_NOWDOC;
+				}
 			}
 		}
 	}
 /* *********************************** */
 yyc_ST_IN_SCRIPTING:
-	YYFILL(16);
-	yych = *YYCURSOR;
-	YYDEBUG(0, yych);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 2) goto yy2;
-	switch (yych) {
+	{
+		static const unsigned char yybm[] = {
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,  18,   2,   0,   0,   2,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			 18,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			236, 236, 204, 204, 204, 204, 204, 204, 
+			140, 140,   0,   0,   0,   0,   0,   0, 
+			  0, 136, 136, 136, 136, 136, 136,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   0,   0,   0,   0,   8, 
+			  0, 136, 136, 136, 136, 136, 136,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   0,   0,   0,   0,   0, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+			  8,   8,   8,   8,   8,   8,   8,   8, 
+		};
+		YYDEBUG(0, *YYCURSOR);
+		YYFILL(16);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 2) {
+			goto yy4;
+		}
+		switch (yych) {
 		case 0x00:
 		case 0x01:
 		case 0x02:
@@ -1700,28 +1477,28 @@
 		case 0x1D:
 		case 0x1E:
 		case 0x1F:
-		case 0x7F: goto yy1;
+		case 0x7F:	goto yy2;
 		case ' ':
-		case '!': goto yy3;
-		case '"': goto yy5;
-		case '#': goto yy6;
-		case '$': goto yy8;
-		case '%': goto yy9;
-		case '&': goto yy10;
-		case '\'': goto yy12;
-		case '(': goto yy13;
+		case '!':	goto yy7;
+		case '"':	goto yy9;
+		case '#':	goto yy11;
+		case '$':	goto yy13;
+		case '%':	goto yy14;
+		case '&':	goto yy15;
+		case '\'':	goto yy17;
+		case '(':	goto yy19;
 		case ')':
-		case ']': goto yy15;
-		case '*': goto yy16;
-		case '+': goto yy17;
+		case ']':	goto yy21;
+		case '*':	goto yy23;
+		case '+':	goto yy24;
 		case ',':
 		case ';':
 		case '@':
-		case '~': goto yy18;
-		case '-': goto yy19;
-		case '.': goto yy20;
-		case '/': goto yy21;
-		case '0': goto yy22;
+		case '~':	goto yy25;
+		case '-':	goto yy26;
+		case '.':	goto yy27;
+		case '/':	goto yy28;
+		case '0':	goto yy29;
 		case '1':
 		case '2':
 		case '3':
@@ -1730,100 +1507,106 @@
 		case '6':
 		case '7':
 		case '8':
-		case '9': goto yy24;
-		case ':': goto yy26;
-		case '<': goto yy27;
-		case '=': goto yy28;
-		case '>': goto yy29;
-		case '?': goto yy30;
+		case '9':	goto yy31;
+		case ':':	goto yy33;
+		case '<':	goto yy34;
+		case '=':	goto yy35;
+		case '>':	goto yy36;
+		case '?':	goto yy37;
 		case 'A':
-		case 'a': goto yy31;
+		case 'a':	goto yy38;
 		case 'B':
-		case 'b': goto yy33;
+		case 'b':	goto yy40;
 		case 'C':
-		case 'c': goto yy34;
+		case 'c':	goto yy41;
 		case 'D':
-		case 'd': goto yy35;
+		case 'd':	goto yy42;
 		case 'E':
-		case 'e': goto yy36;
+		case 'e':	goto yy43;
 		case 'F':
-		case 'f': goto yy37;
+		case 'f':	goto yy44;
 		case 'G':
-		case 'g': goto yy38;
+		case 'g':	goto yy45;
 		case 'I':
-		case 'i': goto yy41;
+		case 'i':	goto yy48;
 		case 'L':
-		case 'l': goto yy42;
+		case 'l':	goto yy49;
 		case 'M':
-		case 'm': goto yy43;
+		case 'm':	goto yy50;
 		case 'N':
-		case 'n': goto yy44;
+		case 'n':	goto yy51;
 		case 'O':
-		case 'o': goto yy45;
+		case 'o':	goto yy52;
 		case 'P':
-		case 'p': goto yy46;
+		case 'p':	goto yy53;
 		case 'R':
-		case 'r': goto yy47;
+		case 'r':	goto yy54;
 		case 'S':
-		case 's': goto yy48;
+		case 's':	goto yy55;
 		case 'T':
-		case 't': goto yy49;
+		case 't':	goto yy56;
 		case 'U':
-		case 'u': goto yy50;
+		case 'u':	goto yy57;
 		case 'V':
-		case 'v': goto yy51;
+		case 'v':	goto yy58;
 		case 'W':
-		case 'w': goto yy52;
+		case 'w':	goto yy59;
 		case 'X':
-		case 'x': goto yy53;
+		case 'x':	goto yy60;
 		case 'Y':
-		case 'y': goto yy54;
-		case '[': goto yy55;
-		case '\\': goto yy56;
-		case '^': goto yy58;
-		case '_': goto yy59;
-		case '`': goto yy60;
-		case '{': goto yy61;
-		case '|': goto yy62;
-		case '}': goto yy63;
-		default: goto yy39;
-	}
-yy1:
-	YYDEBUG(1, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+		case 'y':	goto yy61;
+		case '[':	goto yy62;
+		case '\\':	goto yy63;
+		case '^':	goto yy65;
+		case '_':	goto yy66;
+		case '`':	goto yy67;
+		case '{':	goto yy69;
+		case '|':	goto yy71;
+		case '}':	goto yy72;
+		default:	goto yy46;
+		}
+yy2:
+		YYDEBUG(2, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(3, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	if (YYCURSOR > YYLIMIT) {
 		RETURN_END_TOKEN;
 	}
 
 	RETURN_TOKEN(T_BAD_CHARACTER);
 }
-yy2:
-	YYDEBUG(2, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 2) goto yy2;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy4:
+		YYDEBUG(4, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(5, *YYCURSOR);
+		if (yybm[0+yych] & 2) {
+			goto yy4;
+		}
+		YYDEBUG(6, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	goto return_whitespace;
 }
-yy3:
-	YYDEBUG(3, yych);
-	yych = *++YYCURSOR;
-	if (yych == '=') goto yy64;
-yy4:
-	YYDEBUG(4, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy7:
+		YYDEBUG(7, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '=') goto yy74;
+yy8:
+		YYDEBUG(8, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(yytext[0]);
 }
-yy5:
-	YYDEBUG(5, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy9:
+		YYDEBUG(9, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(10, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	int bprefix = (yytext[0] != '"') ? 1 : 0;
 
 	while (YYCURSOR < YYLIMIT) {
@@ -1867,14 +1650,14 @@
 	BEGIN(ST_DOUBLE_QUOTES);
 	RETURN_TOKEN('"');
 }
-yy6:
-	YYDEBUG(6, yych);
-	yych = *++YYCURSOR;
-	if (yych == '[') goto yy66;
-yy7:
-	YYDEBUG(7, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy11:
+		YYDEBUG(11, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '[') goto yy76;
+yy12:
+		YYDEBUG(12, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	while (YYCURSOR < YYLIMIT) {
 		switch (*YYCURSOR++) {
 			case '\r':
@@ -1897,57 +1680,58 @@
 	yyleng = YYCURSOR - SCNG(yy_text);
 	RETURN_OR_SKIP_TOKEN(T_COMMENT);
 }
-yy8:
-	YYDEBUG(8, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy4;
-		if (yych <= 'Z') goto yy67;
-		if (yych <= '^') goto yy4;
-		goto yy67;
-	} else {
-		if (yych <= '`') goto yy4;
-		if (yych <= 'z') goto yy67;
-		if (yych <= 0x7F) goto yy4;
-		goto yy67;
-	}
-yy9:
-	YYDEBUG(9, yych);
-	yych = *++YYCURSOR;
-	if (yych == '=') goto yy69;
-	goto yy4;
-yy10:
-	YYDEBUG(10, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '#') {
-		if (yych <= '\f') {
-			if (yych <= 0x08) goto yy11;
-			if (yych <= '\n') goto yy70;
-		} else {
-			if (yych <= '\r') goto yy70;
-			if (yych == ' ') goto yy70;
+yy13:
+		YYDEBUG(13, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy8;
+			if (yych <= 'Z') goto yy78;
+			if (yych <= '^') goto yy8;
+			goto yy78;
+		} else {
+			if (yych <= '`') goto yy8;
+			if (yych <= 'z') goto yy78;
+			if (yych <= 0x7F) goto yy8;
+			goto yy78;
 		}
-	} else {
-		if (yych <= '-') {
-			if (yych <= '$') goto yy72;
-			if (yych == '&') goto yy73;
+yy14:
+		YYDEBUG(14, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '=') goto yy81;
+		goto yy8;
+yy15:
+		YYDEBUG(15, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '#') {
+			if (yych <= '\f') {
+				if (yych <= 0x08) goto yy16;
+				if (yych <= '\n') goto yy83;
+			} else {
+				if (yych <= '\r') goto yy83;
+				if (yych == ' ') goto yy83;
+			}
 		} else {
-			if (yych <= '.') goto yy74;
-			if (yych == '=') goto yy75;
+			if (yych <= '-') {
+				if (yych <= '$') goto yy86;
+				if (yych == '&') goto yy88;
+			} else {
+				if (yych <= '.') goto yy90;
+				if (yych == '=') goto yy91;
+			}
 		}
-	}
-yy11:
-	YYDEBUG(11, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy16:
+		YYDEBUG(16, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG);
 }
-yy12:
-	YYDEBUG(12, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy17:
+		YYDEBUG(17, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(18, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	char *s, *t;
 	char *end;
 	int bprefix = (yytext[0] != '\'') ? 1 : 0;
@@ -2041,142 +1825,143 @@
 	}
 	RETURN_TOKEN_WITH_VAL(T_CONSTANT_ENCAPSED_STRING);
 }
-yy13:
-	YYDEBUG(13, yych);
-	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'S') {
-		if (yych <= 'D') {
-			if (yych <= ' ') {
-				if (yych == '\t') goto yy77;
-				if (yych >= ' ') goto yy77;
-			} else {
-				if (yych <= '@') goto yy14;
-				if (yych != 'C') goto yy77;
-			}
-		} else {
-			if (yych <= 'I') {
-				if (yych == 'F') goto yy77;
-				if (yych >= 'I') goto yy77;
-			} else {
-				if (yych == 'O') goto yy77;
-				if (yych >= 'R') goto yy77;
-			}
-		}
-	} else {
-		if (yych <= 'f') {
-			if (yych <= 'b') {
-				if (yych == 'U') goto yy77;
-				if (yych >= 'a') goto yy77;
+yy19:
+		YYDEBUG(19, *YYCURSOR);
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'S') {
+			if (yych <= 'D') {
+				if (yych <= ' ') {
+					if (yych == '\t') goto yy94;
+					if (yych >= ' ') goto yy94;
+				} else {
+					if (yych <= '@') goto yy20;
+					if (yych != 'C') goto yy94;
+				}
 			} else {
-				if (yych == 'd') goto yy77;
-				if (yych >= 'f') goto yy77;
+				if (yych <= 'I') {
+					if (yych == 'F') goto yy94;
+					if (yych >= 'I') goto yy94;
+				} else {
+					if (yych == 'O') goto yy94;
+					if (yych >= 'R') goto yy94;
+				}
 			}
 		} else {
-			if (yych <= 'o') {
-				if (yych == 'i') goto yy77;
-				if (yych >= 'o') goto yy77;
+			if (yych <= 'f') {
+				if (yych <= 'b') {
+					if (yych == 'U') goto yy94;
+					if (yych >= 'a') goto yy94;
+				} else {
+					if (yych == 'd') goto yy94;
+					if (yych >= 'f') goto yy94;
+				}
 			} else {
-				if (yych <= 's') {
-					if (yych >= 'r') goto yy77;
+				if (yych <= 'o') {
+					if (yych == 'i') goto yy94;
+					if (yych >= 'o') goto yy94;
 				} else {
-					if (yych == 'u') goto yy77;
+					if (yych <= 's') {
+						if (yych >= 'r') goto yy94;
+					} else {
+						if (yych == 'u') goto yy94;
+					}
 				}
 			}
 		}
-	}
-yy14:
-	YYDEBUG(14, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy20:
+		YYDEBUG(20, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	enter_nesting(yytext[0]);
 	RETURN_TOKEN(yytext[0]);
 }
-yy15:
-	YYDEBUG(15, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy21:
+		YYDEBUG(21, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(22, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	/* Check that ] and ) match up properly with a preceding [ or ( */
 	RETURN_EXIT_NESTING_TOKEN(yytext[0]);
 }
-yy16:
-	YYDEBUG(16, yych);
-	yych = *++YYCURSOR;
-	if (yych == '*') goto yy87;
-	if (yych == '=') goto yy88;
-	goto yy4;
-yy17:
-	YYDEBUG(17, yych);
-	yych = *++YYCURSOR;
-	if (yych == '+') goto yy89;
-	if (yych == '=') goto yy90;
-	goto yy4;
-yy18:
-	YYDEBUG(18, yych);
-	++YYCURSOR;
-	goto yy4;
-yy19:
-	YYDEBUG(19, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '<') {
-		if (yych == '-') goto yy91;
-		goto yy4;
-	} else {
-		if (yych <= '=') goto yy92;
-		if (yych <= '>') goto yy93;
-		goto yy4;
-	}
-yy20:
-	YYDEBUG(20, yych);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '/') {
-		if (yych == '.') goto yy94;
-		goto yy4;
-	} else {
-		if (yych <= '9') goto yy95;
-		if (yych == '=') goto yy98;
-		goto yy4;
-	}
-yy21:
-	YYDEBUG(21, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '.') {
-		if (yych == '*') goto yy99;
-		goto yy4;
-	} else {
-		if (yych <= '/') goto yy101;
-		if (yych == '=') goto yy102;
-		goto yy4;
-	}
-yy22:
-	YYDEBUG(22, yych);
-	yyaccept = 3;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'X') {
-		if (yych <= 'N') {
-			if (yych == 'B') goto yy104;
-			goto yy25;
-		} else {
-			if (yych <= 'O') goto yy106;
-			if (yych <= 'W') goto yy25;
-			goto yy107;
+yy23:
+		YYDEBUG(23, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '*') goto yy104;
+		if (yych == '=') goto yy106;
+		goto yy8;
+yy24:
+		YYDEBUG(24, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '+') goto yy108;
+		if (yych == '=') goto yy110;
+		goto yy8;
+yy25:
+		YYDEBUG(25, *YYCURSOR);
+		++YYCURSOR;
+		goto yy8;
+yy26:
+		YYDEBUG(26, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '<') {
+			if (yych == '-') goto yy112;
+			goto yy8;
+		} else {
+			if (yych <= '=') goto yy114;
+			if (yych <= '>') goto yy116;
+			goto yy8;
 		}
-	} else {
-		if (yych <= 'n') {
-			if (yych == 'b') goto yy104;
-			goto yy25;
-		} else {
-			if (yych <= 'o') goto yy106;
-			if (yych == 'x') goto yy107;
-			goto yy25;
+yy27:
+		YYDEBUG(27, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '/') {
+			if (yych == '.') goto yy118;
+			goto yy8;
+		} else {
+			if (yych <= '9') goto yy119;
+			if (yych == '=') goto yy122;
+			goto yy8;
 		}
-	}
-yy23:
-	YYDEBUG(23, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy28:
+		YYDEBUG(28, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '.') {
+			if (yych == '*') goto yy124;
+			goto yy8;
+		} else {
+			if (yych <= '/') goto yy126;
+			if (yych == '=') goto yy127;
+			goto yy8;
+		}
+yy29:
+		YYDEBUG(29, *YYCURSOR);
+		yyaccept = 3;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'X') {
+			if (yych <= 'N') {
+				if (yych == 'B') goto yy130;
+				goto yy32;
+			} else {
+				if (yych <= 'O') goto yy132;
+				if (yych <= 'W') goto yy32;
+				goto yy133;
+			}
+		} else {
+			if (yych <= 'n') {
+				if (yych == 'b') goto yy130;
+				goto yy32;
+			} else {
+				if (yych <= 'o') goto yy132;
+				if (yych == 'x') goto yy133;
+				goto yy32;
+			}
+		}
+yy30:
+		YYDEBUG(30, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	size_t len = yyleng;
 	char *end, *lnum = yytext;
 	bool is_octal = lnum[0] == '0';
@@ -2238,1017 +2023,1136 @@
 	}
 	RETURN_TOKEN_WITH_VAL(T_LNUMBER);
 }
-yy24:
-	YYDEBUG(24, yych);
-	yyaccept = 3;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
-yy25:
-	YYDEBUG(25, yych);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 4) goto yy24;
-	if (yych <= 'E') {
-		if (yych == '.') goto yy103;
-		if (yych <= 'D') goto yy23;
-		goto yy105;
-	} else {
-		if (yych <= '_') {
-			if (yych <= '^') goto yy23;
-			goto yy108;
-		} else {
-			if (yych == 'e') goto yy105;
-			goto yy23;
-		}
-	}
-yy26:
-	YYDEBUG(26, yych);
-	yych = *++YYCURSOR;
-	if (yych == ':') goto yy109;
-	goto yy4;
-yy27:
-	YYDEBUG(27, yych);
-	yych = *++YYCURSOR;
-	if (yych <= ';') goto yy4;
-	if (yych <= '<') goto yy110;
-	if (yych <= '=') goto yy112;
-	if (yych <= '>') goto yy113;
-	goto yy4;
-yy28:
-	YYDEBUG(28, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '<') goto yy4;
-	if (yych <= '=') goto yy114;
-	if (yych <= '>') goto yy115;
-	goto yy4;
-yy29:
-	YYDEBUG(29, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '<') goto yy4;
-	if (yych <= '=') goto yy116;
-	if (yych <= '>') goto yy117;
-	goto yy4;
-yy30:
-	YYDEBUG(30, yych);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '=') {
-		if (yych == '-') goto yy118;
-		goto yy4;
-	} else {
-		if (yych <= '>') goto yy119;
-		if (yych <= '?') goto yy121;
-		goto yy4;
-	}
 yy31:
-	YYDEBUG(31, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'S') {
-		if (yych <= 'M') {
-			if (yych == 'B') goto yy122;
-			goto yy40;
-		} else {
-			if (yych <= 'N') goto yy123;
-			if (yych <= 'Q') goto yy40;
-			if (yych <= 'R') goto yy124;
-			goto yy125;
-		}
-	} else {
-		if (yych <= 'n') {
-			if (yych == 'b') goto yy122;
-			if (yych <= 'm') goto yy40;
-			goto yy123;
-		} else {
-			if (yych <= 'q') goto yy40;
-			if (yych <= 'r') goto yy124;
-			if (yych <= 's') goto yy125;
-			goto yy40;
-		}
-	}
+		YYDEBUG(31, *YYCURSOR);
+		yyaccept = 3;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
 yy32:
-	YYDEBUG(32, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_STR(T_STRING, 0);
-}
-yy33:
-	YYDEBUG(33, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= ';') {
-		if (yych <= '"') {
-			if (yych <= '!') goto yy40;
-			goto yy5;
-		} else {
-			if (yych == '\'') goto yy12;
-			goto yy40;
-		}
-	} else {
-		if (yych <= 'R') {
-			if (yych <= '<') goto yy128;
-			if (yych <= 'Q') goto yy40;
-			goto yy129;
-		} else {
-			if (yych == 'r') goto yy129;
-			goto yy40;
+		YYDEBUG(32, *YYCURSOR);
+		if (yybm[0+yych] & 4) {
+			goto yy31;
+		}
+		if (yych <= 'E') {
+			if (yych == '.') goto yy129;
+			if (yych <= 'D') goto yy30;
+			goto yy131;
+		} else {
+			if (yych <= '_') {
+				if (yych <= '^') goto yy30;
+				goto yy134;
+			} else {
+				if (yych == 'e') goto yy131;
+				goto yy30;
+			}
 		}
-	}
+yy33:
+		YYDEBUG(33, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == ':') goto yy135;
+		goto yy8;
 yy34:
-	YYDEBUG(34, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'O') {
-		if (yych <= 'K') {
-			if (yych == 'A') goto yy130;
-			goto yy40;
-		} else {
-			if (yych <= 'L') goto yy131;
-			if (yych <= 'N') goto yy40;
-			goto yy132;
-		}
-	} else {
-		if (yych <= 'k') {
-			if (yych == 'a') goto yy130;
-			goto yy40;
-		} else {
-			if (yych <= 'l') goto yy131;
-			if (yych == 'o') goto yy132;
-			goto yy40;
-		}
-	}
+		YYDEBUG(34, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= ';') goto yy8;
+		if (yych <= '<') goto yy137;
+		if (yych <= '=') goto yy139;
+		if (yych <= '>') goto yy141;
+		goto yy8;
 yy35:
-	YYDEBUG(35, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'O') {
-		if (yych <= 'H') {
-			if (yych == 'E') goto yy133;
-			goto yy40;
-		} else {
-			if (yych <= 'I') goto yy134;
-			if (yych <= 'N') goto yy40;
-			goto yy135;
-		}
-	} else {
-		if (yych <= 'h') {
-			if (yych == 'e') goto yy133;
-			goto yy40;
-		} else {
-			if (yych <= 'i') goto yy134;
-			if (yych == 'o') goto yy135;
-			goto yy40;
-		}
-	}
+		YYDEBUG(35, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '<') goto yy8;
+		if (yych <= '=') goto yy142;
+		if (yych <= '>') goto yy144;
+		goto yy8;
 yy36:
-	YYDEBUG(36, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch (yych) {
-		case 'C':
-		case 'c': goto yy137;
-		case 'L':
-		case 'l': goto yy138;
-		case 'M':
-		case 'm': goto yy139;
-		case 'N':
-		case 'n': goto yy140;
-		case 'V':
-		case 'v': goto yy141;
-		case 'X':
-		case 'x': goto yy142;
-		default: goto yy40;
-	}
+		YYDEBUG(36, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '<') goto yy8;
+		if (yych <= '=') goto yy146;
+		if (yych <= '>') goto yy148;
+		goto yy8;
 yy37:
-	YYDEBUG(37, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'U') {
-		if (yych <= 'M') {
-			if (yych == 'I') goto yy143;
-			goto yy40;
-		} else {
-			if (yych <= 'N') goto yy144;
-			if (yych <= 'O') goto yy146;
-			if (yych <= 'T') goto yy40;
-			goto yy147;
+		YYDEBUG(37, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '=') {
+			if (yych == '-') goto yy150;
+			goto yy8;
+		} else {
+			if (yych <= '>') goto yy151;
+			if (yych <= '?') goto yy153;
+			goto yy8;
 		}
-	} else {
-		if (yych <= 'n') {
-			if (yych == 'i') goto yy143;
-			if (yych <= 'm') goto yy40;
-			goto yy144;
-		} else {
-			if (yych <= 'o') goto yy146;
-			if (yych == 'u') goto yy147;
-			goto yy40;
-		}
-	}
 yy38:
-	YYDEBUG(38, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'O') {
-		if (yych == 'L') goto yy148;
-		if (yych <= 'N') goto yy40;
-		goto yy149;
-	} else {
-		if (yych <= 'l') {
-			if (yych <= 'k') goto yy40;
-			goto yy148;
+		YYDEBUG(38, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'S') {
+			if (yych <= 'M') {
+				if (yych == 'B') goto yy155;
+				goto yy47;
+			} else {
+				if (yych <= 'N') goto yy156;
+				if (yych <= 'Q') goto yy47;
+				if (yych <= 'R') goto yy157;
+				goto yy158;
+			}
 		} else {
-			if (yych == 'o') goto yy149;
-			goto yy40;
+			if (yych <= 'n') {
+				if (yych == 'b') goto yy155;
+				if (yych <= 'm') goto yy47;
+				goto yy156;
+			} else {
+				if (yych <= 'q') goto yy47;
+				if (yych <= 'r') goto yy157;
+				if (yych <= 's') goto yy158;
+				goto yy47;
+			}
 		}
-	}
 yy39:
-	YYDEBUG(39, yych);
-	yyaccept = 4;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
+		YYDEBUG(39, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_STR(T_STRING, 0);
+}
 yy40:
-	YYDEBUG(40, yych);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-	goto yy32;
-yy41:
-	YYDEBUG(41, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'S') {
-		if (yych <= 'L') {
-			if (yych == 'F') goto yy150;
-			goto yy40;
-		} else {
-			if (yych <= 'M') goto yy152;
-			if (yych <= 'N') goto yy153;
-			if (yych <= 'R') goto yy40;
-			goto yy154;
+		YYDEBUG(40, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= ';') {
+			if (yych <= '"') {
+				if (yych <= '!') goto yy47;
+				goto yy9;
+			} else {
+				if (yych == '\'') goto yy17;
+				goto yy47;
+			}
+		} else {
+			if (yych <= 'R') {
+				if (yych <= '<') goto yy161;
+				if (yych <= 'Q') goto yy47;
+				goto yy162;
+			} else {
+				if (yych == 'r') goto yy162;
+				goto yy47;
+			}
 		}
-	} else {
-		if (yych <= 'm') {
-			if (yych == 'f') goto yy150;
-			if (yych <= 'l') goto yy40;
-			goto yy152;
-		} else {
-			if (yych <= 'n') goto yy153;
-			if (yych == 's') goto yy154;
-			goto yy40;
+yy41:
+		YYDEBUG(41, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'O') {
+			if (yych <= 'K') {
+				if (yych == 'A') goto yy163;
+				goto yy47;
+			} else {
+				if (yych <= 'L') goto yy164;
+				if (yych <= 'N') goto yy47;
+				goto yy165;
+			}
+		} else {
+			if (yych <= 'k') {
+				if (yych == 'a') goto yy163;
+				goto yy47;
+			} else {
+				if (yych <= 'l') goto yy164;
+				if (yych == 'o') goto yy165;
+				goto yy47;
+			}
 		}
-	}
 yy42:
-	YYDEBUG(42, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy155;
-	if (yych == 'i') goto yy155;
-	goto yy40;
+		YYDEBUG(42, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'O') {
+			if (yych <= 'H') {
+				if (yych == 'E') goto yy166;
+				goto yy47;
+			} else {
+				if (yych <= 'I') goto yy167;
+				if (yych <= 'N') goto yy47;
+				goto yy168;
+			}
+		} else {
+			if (yych <= 'h') {
+				if (yych == 'e') goto yy166;
+				goto yy47;
+			} else {
+				if (yych <= 'i') goto yy167;
+				if (yych == 'o') goto yy168;
+				goto yy47;
+			}
+		}
 yy43:
-	YYDEBUG(43, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy156;
-	if (yych == 'a') goto yy156;
-	goto yy40;
+		YYDEBUG(43, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		switch (yych) {
+		case 'C':
+		case 'c':	goto yy170;
+		case 'L':
+		case 'l':	goto yy171;
+		case 'M':
+		case 'm':	goto yy172;
+		case 'N':
+		case 'n':	goto yy173;
+		case 'V':
+		case 'v':	goto yy174;
+		case 'X':
+		case 'x':	goto yy175;
+		default:	goto yy47;
+		}
 yy44:
-	YYDEBUG(44, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'E') {
-		if (yych == 'A') goto yy157;
-		if (yych <= 'D') goto yy40;
-		goto yy158;
-	} else {
-		if (yych <= 'a') {
-			if (yych <= '`') goto yy40;
-			goto yy157;
+		YYDEBUG(44, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'U') {
+			if (yych <= 'M') {
+				if (yych == 'I') goto yy176;
+				goto yy47;
+			} else {
+				if (yych <= 'N') goto yy177;
+				if (yych <= 'O') goto yy179;
+				if (yych <= 'T') goto yy47;
+				goto yy180;
+			}
 		} else {
-			if (yych == 'e') goto yy158;
-			goto yy40;
+			if (yych <= 'n') {
+				if (yych == 'i') goto yy176;
+				if (yych <= 'm') goto yy47;
+				goto yy177;
+			} else {
+				if (yych <= 'o') goto yy179;
+				if (yych == 'u') goto yy180;
+				goto yy47;
+			}
 		}
-	}
 yy45:
-	YYDEBUG(45, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy159;
-	if (yych == 'r') goto yy159;
-	goto yy40;
-yy46:
-	YYDEBUG(46, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'U') {
-		if (yych == 'R') goto yy161;
-		if (yych <= 'T') goto yy40;
-		goto yy162;
-	} else {
-		if (yych <= 'r') {
-			if (yych <= 'q') goto yy40;
-			goto yy161;
-		} else {
-			if (yych == 'u') goto yy162;
-			goto yy40;
+		YYDEBUG(45, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'O') {
+			if (yych == 'L') goto yy181;
+			if (yych <= 'N') goto yy47;
+			goto yy182;
+		} else {
+			if (yych <= 'l') {
+				if (yych <= 'k') goto yy47;
+				goto yy181;
+			} else {
+				if (yych == 'o') goto yy182;
+				goto yy47;
+			}
 		}
-	}
+yy46:
+		YYDEBUG(46, *YYCURSOR);
+		yyaccept = 4;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 yy47:
-	YYDEBUG(47, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy163;
-	if (yych == 'e') goto yy163;
-	goto yy40;
+		YYDEBUG(47, *YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+		goto yy39;
 yy48:
-	YYDEBUG(48, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'W') {
-		if (yych == 'T') goto yy164;
-		if (yych <= 'V') goto yy40;
-		goto yy165;
-	} else {
-		if (yych <= 't') {
-			if (yych <= 's') goto yy40;
-			goto yy164;
+		YYDEBUG(48, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'S') {
+			if (yych <= 'L') {
+				if (yych == 'F') goto yy183;
+				goto yy47;
+			} else {
+				if (yych <= 'M') goto yy185;
+				if (yych <= 'N') goto yy186;
+				if (yych <= 'R') goto yy47;
+				goto yy187;
+			}
 		} else {
-			if (yych == 'w') goto yy165;
-			goto yy40;
+			if (yych <= 'm') {
+				if (yych == 'f') goto yy183;
+				if (yych <= 'l') goto yy47;
+				goto yy185;
+			} else {
+				if (yych <= 'n') goto yy186;
+				if (yych == 's') goto yy187;
+				goto yy47;
+			}
 		}
-	}
 yy49:
-	YYDEBUG(49, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'R') {
-		if (yych == 'H') goto yy166;
-		if (yych <= 'Q') goto yy40;
-		goto yy167;
-	} else {
-		if (yych <= 'h') {
-			if (yych <= 'g') goto yy40;
-			goto yy166;
-		} else {
-			if (yych == 'r') goto yy167;
-			goto yy40;
-		}
-	}
+		YYDEBUG(49, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy188;
+		if (yych == 'i') goto yy188;
+		goto yy47;
 yy50:
-	YYDEBUG(50, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'S') {
-		if (yych == 'N') goto yy168;
-		if (yych <= 'R') goto yy40;
-		goto yy169;
-	} else {
-		if (yych <= 'n') {
-			if (yych <= 'm') goto yy40;
-			goto yy168;
-		} else {
-			if (yych == 's') goto yy169;
-			goto yy40;
-		}
-	}
+		YYDEBUG(50, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy189;
+		if (yych == 'a') goto yy189;
+		goto yy47;
 yy51:
-	YYDEBUG(51, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy170;
-	if (yych == 'a') goto yy170;
-	goto yy40;
+		YYDEBUG(51, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'E') {
+			if (yych == 'A') goto yy190;
+			if (yych <= 'D') goto yy47;
+			goto yy191;
+		} else {
+			if (yych <= 'a') {
+				if (yych <= '`') goto yy47;
+				goto yy190;
+			} else {
+				if (yych == 'e') goto yy191;
+				goto yy47;
+			}
+		}
 yy52:
-	YYDEBUG(52, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'H') goto yy171;
-	if (yych == 'h') goto yy171;
-	goto yy40;
+		YYDEBUG(52, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy192;
+		if (yych == 'r') goto yy192;
+		goto yy47;
 yy53:
-	YYDEBUG(53, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy172;
-	if (yych == 'o') goto yy172;
-	goto yy40;
+		YYDEBUG(53, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'U') {
+			if (yych == 'R') goto yy194;
+			if (yych <= 'T') goto yy47;
+			goto yy195;
+		} else {
+			if (yych <= 'r') {
+				if (yych <= 'q') goto yy47;
+				goto yy194;
+			} else {
+				if (yych == 'u') goto yy195;
+				goto yy47;
+			}
+		}
 yy54:
-	YYDEBUG(54, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy173;
-	if (yych == 'i') goto yy173;
-	goto yy40;
+		YYDEBUG(54, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy196;
+		if (yych == 'e') goto yy196;
+		goto yy47;
 yy55:
-	YYDEBUG(55, yych);
-	++YYCURSOR;
-	goto yy14;
+		YYDEBUG(55, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'W') {
+			if (yych == 'T') goto yy197;
+			if (yych <= 'V') goto yy47;
+			goto yy198;
+		} else {
+			if (yych <= 't') {
+				if (yych <= 's') goto yy47;
+				goto yy197;
+			} else {
+				if (yych == 'w') goto yy198;
+				goto yy47;
+			}
+		}
 yy56:
-	YYDEBUG(56, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy57;
-		if (yych <= 'Z') goto yy174;
-		if (yych >= '_') goto yy174;
-	} else {
-		if (yych <= '`') goto yy57;
-		if (yych <= 'z') goto yy174;
-		if (yych >= 0x80) goto yy174;
-	}
+		YYDEBUG(56, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'R') {
+			if (yych == 'H') goto yy199;
+			if (yych <= 'Q') goto yy47;
+			goto yy200;
+		} else {
+			if (yych <= 'h') {
+				if (yych <= 'g') goto yy47;
+				goto yy199;
+			} else {
+				if (yych == 'r') goto yy200;
+				goto yy47;
+			}
+		}
 yy57:
-	YYDEBUG(57, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN(T_NS_SEPARATOR);
-}
+		YYDEBUG(57, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'S') {
+			if (yych == 'N') goto yy201;
+			if (yych <= 'R') goto yy47;
+			goto yy202;
+		} else {
+			if (yych <= 'n') {
+				if (yych <= 'm') goto yy47;
+				goto yy201;
+			} else {
+				if (yych == 's') goto yy202;
+				goto yy47;
+			}
+		}
 yy58:
-	YYDEBUG(58, yych);
-	yych = *++YYCURSOR;
-	if (yych == '=') goto yy176;
-	goto yy4;
+		YYDEBUG(58, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy203;
+		if (yych == 'a') goto yy203;
+		goto yy47;
 yy59:
-	YYDEBUG(59, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy177;
-	goto yy40;
+		YYDEBUG(59, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'H') goto yy204;
+		if (yych == 'h') goto yy204;
+		goto yy47;
 yy60:
-	YYDEBUG(60, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+		YYDEBUG(60, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy205;
+		if (yych == 'o') goto yy205;
+		goto yy47;
+yy61:
+		YYDEBUG(61, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy206;
+		if (yych == 'i') goto yy206;
+		goto yy47;
+yy62:
+		YYDEBUG(62, *YYCURSOR);
+		++YYCURSOR;
+		goto yy20;
+yy63:
+		YYDEBUG(63, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy64;
+			if (yych <= 'Z') goto yy207;
+			if (yych >= '_') goto yy207;
+		} else {
+			if (yych <= '`') goto yy64;
+			if (yych <= 'z') goto yy207;
+			if (yych >= 0x80) goto yy207;
+		}
+yy64:
+		YYDEBUG(64, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN(T_NS_SEPARATOR);
+}
+yy65:
+		YYDEBUG(65, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '=') goto yy210;
+		goto yy8;
+yy66:
+		YYDEBUG(66, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy212;
+		goto yy47;
+yy67:
+		YYDEBUG(67, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(68, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	BEGIN(ST_BACKQUOTE);
 	RETURN_TOKEN('`');
 }
-yy61:
-	YYDEBUG(61, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy69:
+		YYDEBUG(69, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(70, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yy_push_state(ST_IN_SCRIPTING);
 	enter_nesting('{');
 	RETURN_TOKEN('{');
 }
-yy62:
-	YYDEBUG(62, yych);
-	yych = *++YYCURSOR;
-	if (yych == '=') goto yy178;
-	if (yych == '|') goto yy179;
-	goto yy4;
-yy63:
-	YYDEBUG(63, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy71:
+		YYDEBUG(71, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '=') goto yy213;
+		if (yych == '|') goto yy215;
+		goto yy8;
+yy72:
+		YYDEBUG(72, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(73, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RESET_DOC_COMMENT();
 	if (!zend_stack_is_empty(&SCNG(state_stack))) {
 		yy_pop_state();
 	}
 	RETURN_EXIT_NESTING_TOKEN('}');
 }
-yy64:
-	YYDEBUG(64, yych);
-	yych = *++YYCURSOR;
-	if (yych == '=') goto yy180;
-yy65:
-	YYDEBUG(65, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy74:
+		YYDEBUG(74, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '=') goto yy217;
+yy75:
+		YYDEBUG(75, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_IS_NOT_EQUAL);
 }
-yy66:
-	YYDEBUG(66, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy76:
+		YYDEBUG(76, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(77, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	enter_nesting('[');
 	RETURN_TOKEN(T_ATTRIBUTE);
 }
-yy67:
-	YYDEBUG(67, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '^') {
-		if (yych <= '9') {
-			if (yych >= '0') goto yy67;
-		} else {
-			if (yych <= '@') goto yy68;
-			if (yych <= 'Z') goto yy67;
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= '_') goto yy67;
+yy78:
+		YYDEBUG(78, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(79, *YYCURSOR);
+		if (yych <= '^') {
+			if (yych <= '9') {
+				if (yych >= '0') goto yy78;
+			} else {
+				if (yych <= '@') goto yy80;
+				if (yych <= 'Z') goto yy78;
+			}
 		} else {
-			if (yych <= 'z') goto yy67;
-			if (yych >= 0x80) goto yy67;
+			if (yych <= '`') {
+				if (yych <= '_') goto yy78;
+			} else {
+				if (yych <= 'z') goto yy78;
+				if (yych >= 0x80) goto yy78;
+			}
 		}
-	}
-yy68:
-	YYDEBUG(68, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy80:
+		YYDEBUG(80, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy69:
-	YYDEBUG(69, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy81:
+		YYDEBUG(81, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(82, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_MOD_EQUAL);
 }
-yy70:
-	YYDEBUG(70, yych);
-	++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
-	if (yych <= 0x1F) {
-		if (yych <= '\n') {
-			if (yych >= '\t') goto yy70;
-		} else {
-			if (yych == '\r') goto yy70;
-		}
-	} else {
-		if (yych <= '$') {
-			if (yych <= ' ') goto yy70;
-			if (yych >= '$') goto yy72;
-		} else {
-			if (yych == '.') goto yy74;
-		}
-	}
-yy71:
-	YYDEBUG(71, yych);
-	YYCURSOR = YYMARKER;
-	if (yyaccept <= 46) {
-		if (yyaccept <= 23) {
-			if (yyaccept <= 11) {
-				if (yyaccept <= 5) {
-					if (yyaccept <= 2) {
-						if (yyaccept <= 1) {
-							if (yyaccept == 0) goto yy11;
-							else goto yy14;
-						} else {
-							goto yy4;
-						}
-					} else {
-						if (yyaccept <= 4) {
-							if (yyaccept == 3) goto yy23;
-							else goto yy32;
-						} else {
-							goto yy97;
-						}
-					}
-				} else {
-					if (yyaccept <= 8) {
-						if (yyaccept <= 7) {
-							if (yyaccept == 6) goto yy100;
-							else goto yy111;
-						} else {
-							goto yy126;
-						}
-					} else {
-						if (yyaccept <= 10) {
-							if (yyaccept == 9) goto yy136;
-							else goto yy145;
-						} else {
-							goto yy151;
-						}
-					}
-				}
+yy83:
+		YYDEBUG(83, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
+		YYDEBUG(84, *YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych <= '\n') {
+				if (yych >= '\t') goto yy83;
 			} else {
-				if (yyaccept <= 17) {
-					if (yyaccept <= 14) {
-						if (yyaccept <= 13) {
-							if (yyaccept == 12) goto yy160;
-							else goto yy175;
-						} else {
-							goto yy197;
-						}
-					} else {
-						if (yyaccept <= 16) {
-							if (yyaccept == 15) goto yy201;
-							else goto yy203;
-						} else {
-							goto yy215;
-						}
-					}
-				} else {
-					if (yyaccept <= 20) {
-						if (yyaccept <= 19) {
-							if (yyaccept == 18) goto yy218;
-							else goto yy230;
-						} else {
-							goto yy241;
-						}
-					} else {
-						if (yyaccept <= 22) {
-							if (yyaccept == 21) goto yy254;
-							else goto yy266;
-						} else {
-							goto yy269;
-						}
-					}
-				}
+				if (yych == '\r') goto yy83;
 			}
 		} else {
-			if (yyaccept <= 35) {
-				if (yyaccept <= 29) {
-					if (yyaccept <= 26) {
-						if (yyaccept <= 25) {
-							if (yyaccept == 24) goto yy271;
-							else goto yy274;
-						} else {
-							goto yy304;
-						}
-					} else {
-						if (yyaccept <= 28) {
-							if (yyaccept == 27) goto yy313;
-							else goto yy315;
-						} else {
-							goto yy324;
-						}
-					}
-				} else {
-					if (yyaccept <= 32) {
-						if (yyaccept <= 31) {
-							if (yyaccept == 30) goto yy326;
-							else goto yy333;
-						} else {
-							goto yy340;
-						}
-					} else {
-						if (yyaccept <= 34) {
-							if (yyaccept == 33) goto yy387;
-							else goto yy389;
-						} else {
-							goto yy392;
-						}
-					}
-				}
+			if (yych <= '$') {
+				if (yych <= ' ') goto yy83;
+				if (yych >= '$') goto yy86;
 			} else {
-				if (yyaccept <= 41) {
-					if (yyaccept <= 38) {
-						if (yyaccept <= 37) {
-							if (yyaccept == 36) goto yy394;
-							else goto yy396;
-						} else {
-							goto yy398;
-						}
-					} else {
-						if (yyaccept <= 40) {
-							if (yyaccept == 39) goto yy404;
-							else goto yy408;
-						} else {
-							goto yy414;
-						}
-					}
-				} else {
-					if (yyaccept <= 44) {
-						if (yyaccept <= 43) {
-							if (yyaccept == 42) goto yy424;
-							else goto yy426;
-						} else {
-							goto yy429;
-						}
-					} else {
-						if (yyaccept == 45) goto yy439;
-						else goto yy441;
-					}
-				}
+				if (yych == '.') goto yy90;
 			}
 		}
-	} else {
-		if (yyaccept <= 69) {
-			if (yyaccept <= 58) {
-				if (yyaccept <= 52) {
-					if (yyaccept <= 49) {
-						if (yyaccept <= 48) {
-							if (yyaccept == 47) goto yy443;
-							else goto yy445;
+yy85:
+		YYDEBUG(85, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		if (yyaccept <= 46) {
+			if (yyaccept <= 23) {
+				if (yyaccept <= 11) {
+					if (yyaccept <= 5) {
+						if (yyaccept <= 2) {
+							if (yyaccept <= 1) {
+								if (yyaccept == 0) {
+									goto yy16;
+								} else {
+									goto yy20;
+								}
+							} else {
+								goto yy8;
+							}
 						} else {
-							goto yy447;
+							if (yyaccept <= 4) {
+								if (yyaccept == 3) {
+									goto yy30;
+								} else {
+									goto yy39;
+								}
+							} else {
+								goto yy121;
+							}
 						}
 					} else {
-						if (yyaccept <= 51) {
-							if (yyaccept == 50) goto yy476;
-							else goto yy479;
+						if (yyaccept <= 8) {
+							if (yyaccept <= 7) {
+								if (yyaccept == 6) {
+									goto yy125;
+								} else {
+									goto yy138;
+								}
+							} else {
+								goto yy159;
+							}
 						} else {
-							goto yy483;
+							if (yyaccept <= 10) {
+								if (yyaccept == 9) {
+									goto yy169;
+								} else {
+									goto yy178;
+								}
+							} else {
+								goto yy184;
+							}
 						}
 					}
 				} else {
-					if (yyaccept <= 55) {
-						if (yyaccept <= 54) {
-							if (yyaccept == 53) goto yy491;
-							else goto yy501;
+					if (yyaccept <= 17) {
+						if (yyaccept <= 14) {
+							if (yyaccept <= 13) {
+								if (yyaccept == 12) {
+									goto yy193;
+								} else {
+									goto yy209;
+								}
+							} else {
+								goto yy238;
+							}
 						} else {
-							goto yy505;
+							if (yyaccept <= 16) {
+								if (yyaccept == 15) {
+									goto yy244;
+								} else {
+									goto yy247;
+								}
+							} else {
+								goto yy266;
+							}
 						}
 					} else {
-						if (yyaccept <= 57) {
-							if (yyaccept == 56) goto yy507;
-							else goto yy509;
+						if (yyaccept <= 20) {
+							if (yyaccept <= 19) {
+								if (yyaccept == 18) {
+									goto yy270;
+								} else {
+									goto yy282;
+								}
+							} else {
+								goto yy293;
+							}
 						} else {
-							goto yy531;
+							if (yyaccept <= 22) {
+								if (yyaccept == 21) {
+									goto yy306;
+								} else {
+									goto yy318;
+								}
+							} else {
+								goto yy321;
+							}
 						}
 					}
 				}
 			} else {
-				if (yyaccept <= 64) {
-					if (yyaccept <= 61) {
-						if (yyaccept <= 60) {
-							if (yyaccept == 59) goto yy533;
-							else goto yy541;
+				if (yyaccept <= 35) {
+					if (yyaccept <= 29) {
+						if (yyaccept <= 26) {
+							if (yyaccept <= 25) {
+								if (yyaccept == 24) {
+									goto yy323;
+								} else {
+									goto yy326;
+								}
+							} else {
+								goto yy358;
+							}
 						} else {
-							goto yy543;
+							if (yyaccept <= 28) {
+								if (yyaccept == 27) {
+									goto yy367;
+								} else {
+									goto yy369;
+								}
+							} else {
+								goto yy378;
+							}
 						}
 					} else {
-						if (yyaccept <= 63) {
-							if (yyaccept == 62) goto yy545;
-							else goto yy549;
+						if (yyaccept <= 32) {
+							if (yyaccept <= 31) {
+								if (yyaccept == 30) {
+									goto yy380;
+								} else {
+									goto yy387;
+								}
+							} else {
+								goto yy394;
+							}
 						} else {
-							goto yy555;
+							if (yyaccept <= 34) {
+								if (yyaccept == 33) {
+									goto yy444;
+								} else {
+									goto yy446;
+								}
+							} else {
+								goto yy449;
+							}
 						}
 					}
 				} else {
-					if (yyaccept <= 67) {
-						if (yyaccept <= 66) {
-							if (yyaccept == 65) goto yy559;
-							else goto yy563;
+					if (yyaccept <= 41) {
+						if (yyaccept <= 38) {
+							if (yyaccept <= 37) {
+								if (yyaccept == 36) {
+									goto yy451;
+								} else {
+									goto yy453;
+								}
+							} else {
+								goto yy455;
+							}
 						} else {
-							goto yy574;
+							if (yyaccept <= 40) {
+								if (yyaccept == 39) {
+									goto yy461;
+								} else {
+									goto yy465;
+								}
+							} else {
+								goto yy472;
+							}
 						}
 					} else {
-						if (yyaccept == 68) goto yy576;
-						else goto yy578;
+						if (yyaccept <= 44) {
+							if (yyaccept <= 43) {
+								if (yyaccept == 42) {
+									goto yy482;
+								} else {
+									goto yy484;
+								}
+							} else {
+								goto yy487;
+							}
+						} else {
+							if (yyaccept == 45) {
+								goto yy497;
+							} else {
+								goto yy499;
+							}
+						}
 					}
 				}
 			}
 		} else {
-			if (yyaccept <= 81) {
-				if (yyaccept <= 75) {
-					if (yyaccept <= 72) {
-						if (yyaccept <= 71) {
-							if (yyaccept == 70) goto yy583;
-							else goto yy587;
+			if (yyaccept <= 69) {
+				if (yyaccept <= 58) {
+					if (yyaccept <= 52) {
+						if (yyaccept <= 49) {
+							if (yyaccept <= 48) {
+								if (yyaccept == 47) {
+									goto yy501;
+								} else {
+									goto yy503;
+								}
+							} else {
+								goto yy505;
+							}
 						} else {
-							goto yy596;
+							if (yyaccept <= 51) {
+								if (yyaccept == 50) {
+									goto yy540;
+								} else {
+									goto yy543;
+								}
+							} else {
+								goto yy547;
+							}
 						}
 					} else {
-						if (yyaccept <= 74) {
-							if (yyaccept == 73) goto yy601;
-							else goto yy605;
+						if (yyaccept <= 55) {
+							if (yyaccept <= 54) {
+								if (yyaccept == 53) {
+									goto yy555;
+								} else {
+									goto yy565;
+								}
+							} else {
+								goto yy569;
+							}
 						} else {
-							goto yy612;
+							if (yyaccept <= 57) {
+								if (yyaccept == 56) {
+									goto yy571;
+								} else {
+									goto yy573;
+								}
+							} else {
+								goto yy601;
+							}
 						}
 					}
 				} else {
-					if (yyaccept <= 78) {
-						if (yyaccept <= 77) {
-							if (yyaccept == 76) goto yy619;
-							else goto yy621;
+					if (yyaccept <= 64) {
+						if (yyaccept <= 61) {
+							if (yyaccept <= 60) {
+								if (yyaccept == 59) {
+									goto yy603;
+								} else {
+									goto yy611;
+								}
+							} else {
+								goto yy613;
+							}
 						} else {
-							goto yy623;
+							if (yyaccept <= 63) {
+								if (yyaccept == 62) {
+									goto yy615;
+								} else {
+									goto yy619;
+								}
+							} else {
+								goto yy625;
+							}
 						}
 					} else {
-						if (yyaccept <= 80) {
-							if (yyaccept == 79) goto yy625;
-							else goto yy629;
+						if (yyaccept <= 67) {
+							if (yyaccept <= 66) {
+								if (yyaccept == 65) {
+									goto yy629;
+								} else {
+									goto yy633;
+								}
+							} else {
+								goto yy646;
+							}
 						} else {
-							goto yy635;
+							if (yyaccept == 68) {
+								goto yy648;
+							} else {
+								goto yy650;
+							}
 						}
 					}
 				}
 			} else {
-				if (yyaccept <= 87) {
-					if (yyaccept <= 84) {
-						if (yyaccept <= 83) {
-							if (yyaccept == 82) goto yy637;
-							else goto yy639;
+				if (yyaccept <= 81) {
+					if (yyaccept <= 75) {
+						if (yyaccept <= 72) {
+							if (yyaccept <= 71) {
+								if (yyaccept == 70) {
+									goto yy655;
+								} else {
+									goto yy659;
+								}
+							} else {
+								goto yy668;
+							}
 						} else {
-							goto yy643;
+							if (yyaccept <= 74) {
+								if (yyaccept == 73) {
+									goto yy673;
+								} else {
+									goto yy677;
+								}
+							} else {
+								goto yy684;
+							}
 						}
 					} else {
-						if (yyaccept <= 86) {
-							if (yyaccept == 85) goto yy646;
-							else goto yy653;
+						if (yyaccept <= 78) {
+							if (yyaccept <= 77) {
+								if (yyaccept == 76) {
+									goto yy691;
+								} else {
+									goto yy693;
+								}
+							} else {
+								goto yy695;
+							}
 						} else {
-							goto yy659;
+							if (yyaccept <= 80) {
+								if (yyaccept == 79) {
+									goto yy697;
+								} else {
+									goto yy701;
+								}
+							} else {
+								goto yy707;
+							}
 						}
 					}
 				} else {
-					if (yyaccept <= 90) {
-						if (yyaccept <= 89) {
-							if (yyaccept == 88) goto yy668;
-							else goto yy670;
+					if (yyaccept <= 87) {
+						if (yyaccept <= 84) {
+							if (yyaccept <= 83) {
+								if (yyaccept == 82) {
+									goto yy709;
+								} else {
+									goto yy711;
+								}
+							} else {
+								goto yy715;
+							}
 						} else {
-							goto yy672;
+							if (yyaccept <= 86) {
+								if (yyaccept == 85) {
+									goto yy718;
+								} else {
+									goto yy725;
+								}
+							} else {
+								goto yy732;
+							}
 						}
 					} else {
-						if (yyaccept == 91) goto yy678;
-						else goto yy681;
+						if (yyaccept <= 90) {
+							if (yyaccept <= 89) {
+								if (yyaccept == 88) {
+									goto yy743;
+								} else {
+									goto yy745;
+								}
+							} else {
+								goto yy747;
+							}
+						} else {
+							if (yyaccept == 91) {
+								goto yy753;
+							} else {
+								goto yy756;
+							}
+						}
 					}
 				}
 			}
 		}
-	}
-yy72:
-	YYDEBUG(72, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy86:
+		YYDEBUG(86, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(87, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(1);
 	RETURN_TOKEN(T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG);
 }
-yy73:
-	YYDEBUG(73, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy88:
+		YYDEBUG(88, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(89, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_BOOLEAN_AND);
 }
-yy74:
-	YYDEBUG(74, yych);
-	yych = *++YYCURSOR;
-	if (yych == '.') goto yy181;
-	goto yy71;
-yy75:
-	YYDEBUG(75, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy90:
+		YYDEBUG(90, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '.') goto yy219;
+		goto yy85;
+yy91:
+		YYDEBUG(91, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(92, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_AND_EQUAL);
 }
-yy76:
-	YYDEBUG(76, yych);
-	++YYCURSOR;
-	YYFILL(7);
-	yych = *YYCURSOR;
-yy77:
-	YYDEBUG(77, yych);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 16) goto yy76;
-	switch (yych) {
+yy93:
+		YYDEBUG(93, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(7);
+		yych = *YYCURSOR;
+yy94:
+		YYDEBUG(94, *YYCURSOR);
+		if (yybm[0+yych] & 16) {
+			goto yy93;
+		}
+		switch (yych) {
 		case 'A':
-		case 'a': goto yy78;
+		case 'a':	goto yy95;
 		case 'B':
-		case 'b': goto yy79;
+		case 'b':	goto yy96;
 		case 'D':
-		case 'd': goto yy80;
+		case 'd':	goto yy97;
 		case 'F':
-		case 'f': goto yy81;
+		case 'f':	goto yy98;
 		case 'I':
-		case 'i': goto yy82;
+		case 'i':	goto yy99;
 		case 'O':
-		case 'o': goto yy83;
+		case 'o':	goto yy100;
 		case 'R':
-		case 'r': goto yy84;
+		case 'r':	goto yy101;
 		case 'S':
-		case 's': goto yy85;
+		case 's':	goto yy102;
 		case 'U':
-		case 'u': goto yy86;
-		default: goto yy71;
-	}
-yy78:
-	YYDEBUG(78, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy182;
-	if (yych == 'r') goto yy182;
-	goto yy71;
-yy79:
-	YYDEBUG(79, yych);
-	yych = *++YYCURSOR;
-	if (yych <= 'O') {
-		if (yych == 'I') goto yy183;
-		if (yych <= 'N') goto yy71;
-		goto yy184;
-	} else {
-		if (yych <= 'i') {
-			if (yych <= 'h') goto yy71;
-			goto yy183;
+		case 'u':	goto yy103;
+		default:	goto yy85;
+		}
+yy95:
+		YYDEBUG(95, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'R') goto yy220;
+		if (yych == 'r') goto yy220;
+		goto yy85;
+yy96:
+		YYDEBUG(96, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= 'O') {
+			if (yych == 'I') goto yy221;
+			if (yych <= 'N') goto yy85;
+			goto yy222;
 		} else {
-			if (yych == 'o') goto yy184;
-			goto yy71;
+			if (yych <= 'i') {
+				if (yych <= 'h') goto yy85;
+				goto yy221;
+			} else {
+				if (yych == 'o') goto yy222;
+				goto yy85;
+			}
 		}
-	}
-yy80:
-	YYDEBUG(80, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy185;
-	if (yych == 'o') goto yy185;
-	goto yy71;
-yy81:
-	YYDEBUG(81, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy186;
-	if (yych == 'l') goto yy186;
-	goto yy71;
-yy82:
-	YYDEBUG(82, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy187;
-	if (yych == 'n') goto yy187;
-	goto yy71;
-yy83:
-	YYDEBUG(83, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy188;
-	if (yych == 'b') goto yy188;
-	goto yy71;
-yy84:
-	YYDEBUG(84, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy189;
-	if (yych == 'e') goto yy189;
-	goto yy71;
-yy85:
-	YYDEBUG(85, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy190;
-	if (yych == 't') goto yy190;
-	goto yy71;
-yy86:
-	YYDEBUG(86, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy191;
-	if (yych == 'n') goto yy191;
-	goto yy71;
-yy87:
-	YYDEBUG(87, yych);
-	yych = *++YYCURSOR;
-	if (yych == '=') goto yy192;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy97:
+		YYDEBUG(97, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'O') goto yy223;
+		if (yych == 'o') goto yy223;
+		goto yy85;
+yy98:
+		YYDEBUG(98, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'L') goto yy224;
+		if (yych == 'l') goto yy224;
+		goto yy85;
+yy99:
+		YYDEBUG(99, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'N') goto yy225;
+		if (yych == 'n') goto yy225;
+		goto yy85;
+yy100:
+		YYDEBUG(100, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'B') goto yy226;
+		if (yych == 'b') goto yy226;
+		goto yy85;
+yy101:
+		YYDEBUG(101, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy227;
+		if (yych == 'e') goto yy227;
+		goto yy85;
+yy102:
+		YYDEBUG(102, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'T') goto yy228;
+		if (yych == 't') goto yy228;
+		goto yy85;
+yy103:
+		YYDEBUG(103, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'N') goto yy229;
+		if (yych == 'n') goto yy229;
+		goto yy85;
+yy104:
+		YYDEBUG(104, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '=') goto yy230;
+		YYDEBUG(105, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_POW);
 }
-yy88:
-	YYDEBUG(88, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy106:
+		YYDEBUG(106, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(107, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_MUL_EQUAL);
 }
-yy89:
-	YYDEBUG(89, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy108:
+		YYDEBUG(108, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(109, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_INC);
 }
-yy90:
-	YYDEBUG(90, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy110:
+		YYDEBUG(110, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(111, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_PLUS_EQUAL);
 }
-yy91:
-	YYDEBUG(91, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy112:
+		YYDEBUG(112, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(113, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_DEC);
 }
-yy92:
-	YYDEBUG(92, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy114:
+		YYDEBUG(114, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(115, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_MINUS_EQUAL);
 }
-yy93:
-	YYDEBUG(93, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy116:
+		YYDEBUG(116, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(117, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
 	RETURN_TOKEN(T_OBJECT_OPERATOR);
 }
-yy94:
-	YYDEBUG(94, yych);
-	yych = *++YYCURSOR;
-	if (yych == '.') goto yy193;
-	goto yy71;
-yy95:
-	YYDEBUG(95, yych);
-	yyaccept = 5;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-yy96:
-	YYDEBUG(96, yych);
-	if (yych <= 'E') {
-		if (yych <= '/') goto yy97;
-		if (yych <= '9') goto yy95;
-		if (yych >= 'E') goto yy105;
-	} else {
-		if (yych <= '_') {
-			if (yych >= '_') goto yy194;
+yy118:
+		YYDEBUG(118, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '.') goto yy232;
+		goto yy85;
+yy119:
+		YYDEBUG(119, *YYCURSOR);
+		yyaccept = 5;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+yy120:
+		YYDEBUG(120, *YYCURSOR);
+		if (yych <= 'E') {
+			if (yych <= '/') goto yy121;
+			if (yych <= '9') goto yy119;
+			if (yych >= 'E') goto yy131;
 		} else {
-			if (yych == 'e') goto yy105;
+			if (yych <= '_') {
+				if (yych >= '_') goto yy234;
+			} else {
+				if (yych == 'e') goto yy131;
+			}
 		}
-	}
-yy97:
-	YYDEBUG(97, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy121:
+		YYDEBUG(121, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	const char *end;
 	size_t len = yyleng;
 	char *dnum = yytext;
@@ -3267,22 +3171,23 @@
 	}
 	RETURN_TOKEN_WITH_VAL(T_DNUMBER);
 }
-yy98:
-	YYDEBUG(98, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy122:
+		YYDEBUG(122, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(123, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_CONCAT_EQUAL);
 }
-yy99:
-	YYDEBUG(99, yych);
-	yyaccept = 6;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '*') goto yy195;
-yy100:
-	YYDEBUG(100, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy124:
+		YYDEBUG(124, *YYCURSOR);
+		yyaccept = 6;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '*') goto yy235;
+yy125:
+		YYDEBUG(125, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	int doc_com;
 
 	if (yyleng > 2) {
@@ -3317,139 +3222,154 @@
 
 	RETURN_OR_SKIP_TOKEN(T_COMMENT);
 }
-yy101:
-	YYDEBUG(101, yych);
-	++YYCURSOR;
-	goto yy7;
-yy102:
-	YYDEBUG(102, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy126:
+		YYDEBUG(126, *YYCURSOR);
+		++YYCURSOR;
+		goto yy12;
+yy127:
+		YYDEBUG(127, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(128, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_DIV_EQUAL);
 }
-yy103:
-	YYDEBUG(103, yych);
-	yyaccept = 5;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy97;
-	goto yy96;
-yy104:
-	YYDEBUG(104, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 32) goto yy196;
-	goto yy71;
-yy105:
-	YYDEBUG(105, yych);
-	yych = *++YYCURSOR;
-	if (yych <= ',') {
-		if (yych == '+') goto yy198;
-		goto yy71;
-	} else {
-		if (yych <= '-') goto yy198;
-		if (yych <= '/') goto yy71;
-		if (yych <= '9') goto yy199;
-		goto yy71;
-	}
-yy106:
-	YYDEBUG(106, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 64) goto yy200;
-	goto yy71;
-yy107:
-	YYDEBUG(107, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 128) goto yy202;
-	goto yy71;
-yy108:
-	YYDEBUG(108, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 4) goto yy24;
-	goto yy71;
-yy109:
-	YYDEBUG(109, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy129:
+		YYDEBUG(129, *YYCURSOR);
+		yyaccept = 5;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy121;
+		goto yy120;
+yy130:
+		YYDEBUG(130, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 32) {
+			goto yy236;
+		}
+		goto yy85;
+yy131:
+		YYDEBUG(131, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= ',') {
+			if (yych == '+') goto yy239;
+			goto yy85;
+		} else {
+			if (yych <= '-') goto yy239;
+			if (yych <= '/') goto yy85;
+			if (yych <= '9') goto yy240;
+			goto yy85;
+		}
+yy132:
+		YYDEBUG(132, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 64) {
+			goto yy242;
+		}
+		goto yy85;
+yy133:
+		YYDEBUG(133, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 128) {
+			goto yy245;
+		}
+		goto yy85;
+yy134:
+		YYDEBUG(134, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 4) {
+			goto yy31;
+		}
+		goto yy85;
+yy135:
+		YYDEBUG(135, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(136, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_PAAMAYIM_NEKUDOTAYIM);
 }
-yy110:
-	YYDEBUG(110, yych);
-	yyaccept = 7;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= ';') goto yy111;
-	if (yych <= '<') goto yy204;
-	if (yych <= '=') goto yy205;
-yy111:
-	YYDEBUG(111, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy137:
+		YYDEBUG(137, *YYCURSOR);
+		yyaccept = 7;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= ';') goto yy138;
+		if (yych <= '<') goto yy248;
+		if (yych <= '=') goto yy250;
+yy138:
+		YYDEBUG(138, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_SL);
 }
-yy112:
-	YYDEBUG(112, yych);
-	yych = *++YYCURSOR;
-	if (yych == '>') goto yy206;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy139:
+		YYDEBUG(139, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy252;
+		YYDEBUG(140, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_IS_SMALLER_OR_EQUAL);
 }
-yy113:
-	YYDEBUG(113, yych);
-	++YYCURSOR;
-	goto yy65;
-yy114:
-	YYDEBUG(114, yych);
-	yych = *++YYCURSOR;
-	if (yych == '=') goto yy207;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy141:
+		YYDEBUG(141, *YYCURSOR);
+		++YYCURSOR;
+		goto yy75;
+yy142:
+		YYDEBUG(142, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '=') goto yy254;
+		YYDEBUG(143, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_IS_EQUAL);
 }
-yy115:
-	YYDEBUG(115, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy144:
+		YYDEBUG(144, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(145, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_DOUBLE_ARROW);
 }
-yy116:
-	YYDEBUG(116, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy146:
+		YYDEBUG(146, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(147, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_IS_GREATER_OR_EQUAL);
 }
-yy117:
-	YYDEBUG(117, yych);
-	yych = *++YYCURSOR;
-	if (yych == '=') goto yy208;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy148:
+		YYDEBUG(148, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '=') goto yy256;
+		YYDEBUG(149, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_SR);
 }
-yy118:
-	YYDEBUG(118, yych);
-	yych = *++YYCURSOR;
-	if (yych == '>') goto yy209;
-	goto yy71;
-yy119:
-	YYDEBUG(119, yych);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy210;
-	if (yych == '\r') goto yy211;
-yy120:
-	YYDEBUG(120, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy150:
+		YYDEBUG(150, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy258;
+		goto yy85;
+yy151:
+		YYDEBUG(151, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy260;
+		if (yych == '\r') goto yy261;
+yy152:
+		YYDEBUG(152, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	BEGIN(INITIAL);
 	if (yytext[yyleng-1] != '>') {
 		CG(increment_lineno) = 1;
@@ -3459,673 +3379,694 @@
 	}
 	RETURN_TOKEN(T_CLOSE_TAG);
 }
-yy121:
-	YYDEBUG(121, yych);
-	yych = *++YYCURSOR;
-	if (yych == '=') goto yy212;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy153:
+		YYDEBUG(153, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '=') goto yy262;
+		YYDEBUG(154, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_COALESCE);
 }
-yy122:
-	YYDEBUG(122, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy213;
-	if (yych == 's') goto yy213;
-	goto yy40;
-yy123:
-	YYDEBUG(123, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy214;
-	if (yych == 'd') goto yy214;
-	goto yy40;
-yy124:
-	YYDEBUG(124, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy216;
-	if (yych == 'r') goto yy216;
-	goto yy40;
-yy125:
-	YYDEBUG(125, yych);
-	yyaccept = 8;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy126:
-	YYDEBUG(126, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy155:
+		YYDEBUG(155, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy264;
+		if (yych == 's') goto yy264;
+		goto yy47;
+yy156:
+		YYDEBUG(156, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy265;
+		if (yych == 'd') goto yy265;
+		goto yy47;
+yy157:
+		YYDEBUG(157, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy267;
+		if (yych == 'r') goto yy267;
+		goto yy47;
+yy158:
+		YYDEBUG(158, *YYCURSOR);
+		yyaccept = 8;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy159:
+		YYDEBUG(159, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_IDENT(T_AS);
 }
-yy127:
-	YYDEBUG(127, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy71;
-		if (yych <= 'Z') goto yy217;
-		if (yych <= '^') goto yy71;
-		goto yy217;
-	} else {
-		if (yych <= '`') goto yy71;
-		if (yych <= 'z') goto yy217;
-		if (yych <= 0x7F) goto yy71;
-		goto yy217;
-	}
-yy128:
-	YYDEBUG(128, yych);
-	yych = *++YYCURSOR;
-	if (yych == '<') goto yy219;
-	goto yy71;
-yy129:
-	YYDEBUG(129, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy220;
-	if (yych == 'e') goto yy220;
-	goto yy40;
-yy130:
-	YYDEBUG(130, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'T') {
-		if (yych <= 'L') {
-			if (yych <= 'K') goto yy40;
-			goto yy221;
-		} else {
-			if (yych <= 'R') goto yy40;
-			if (yych <= 'S') goto yy222;
-			goto yy223;
-		}
-	} else {
-		if (yych <= 'r') {
-			if (yych == 'l') goto yy221;
-			goto yy40;
-		} else {
-			if (yych <= 's') goto yy222;
-			if (yych <= 't') goto yy223;
-			goto yy40;
+yy160:
+		YYDEBUG(160, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy85;
+			if (yych <= 'Z') goto yy268;
+			if (yych <= '^') goto yy85;
+			goto yy268;
+		} else {
+			if (yych <= '`') goto yy85;
+			if (yych <= 'z') goto yy268;
+			if (yych <= 0x7F) goto yy85;
+			goto yy268;
 		}
-	}
-yy131:
-	YYDEBUG(131, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'O') {
-		if (yych == 'A') goto yy224;
-		if (yych <= 'N') goto yy40;
-		goto yy225;
-	} else {
-		if (yych <= 'a') {
-			if (yych <= '`') goto yy40;
-			goto yy224;
+yy161:
+		YYDEBUG(161, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '<') goto yy271;
+		goto yy85;
+yy162:
+		YYDEBUG(162, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy272;
+		if (yych == 'e') goto yy272;
+		goto yy47;
+yy163:
+		YYDEBUG(163, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'T') {
+			if (yych <= 'L') {
+				if (yych <= 'K') goto yy47;
+				goto yy273;
+			} else {
+				if (yych <= 'R') goto yy47;
+				if (yych <= 'S') goto yy274;
+				goto yy275;
+			}
 		} else {
-			if (yych == 'o') goto yy225;
-			goto yy40;
+			if (yych <= 'r') {
+				if (yych == 'l') goto yy273;
+				goto yy47;
+			} else {
+				if (yych <= 's') goto yy274;
+				if (yych <= 't') goto yy275;
+				goto yy47;
+			}
 		}
-	}
-yy132:
-	YYDEBUG(132, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy226;
-	if (yych == 'n') goto yy226;
-	goto yy40;
-yy133:
-	YYDEBUG(133, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'F') {
-		if (yych == 'C') goto yy227;
-		if (yych <= 'E') goto yy40;
-		goto yy228;
-	} else {
-		if (yych <= 'c') {
-			if (yych <= 'b') goto yy40;
-			goto yy227;
-		} else {
-			if (yych == 'f') goto yy228;
-			goto yy40;
+yy164:
+		YYDEBUG(164, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'O') {
+			if (yych == 'A') goto yy276;
+			if (yych <= 'N') goto yy47;
+			goto yy277;
+		} else {
+			if (yych <= 'a') {
+				if (yych <= '`') goto yy47;
+				goto yy276;
+			} else {
+				if (yych == 'o') goto yy277;
+				goto yy47;
+			}
 		}
-	}
-yy134:
-	YYDEBUG(134, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy229;
-	if (yych == 'e') goto yy229;
-	goto yy40;
-yy135:
-	YYDEBUG(135, yych);
-	yyaccept = 9;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy136:
-	YYDEBUG(136, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy165:
+		YYDEBUG(165, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy278;
+		if (yych == 'n') goto yy278;
+		goto yy47;
+yy166:
+		YYDEBUG(166, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'F') {
+			if (yych == 'C') goto yy279;
+			if (yych <= 'E') goto yy47;
+			goto yy280;
+		} else {
+			if (yych <= 'c') {
+				if (yych <= 'b') goto yy47;
+				goto yy279;
+			} else {
+				if (yych == 'f') goto yy280;
+				goto yy47;
+			}
+		}
+yy167:
+		YYDEBUG(167, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy281;
+		if (yych == 'e') goto yy281;
+		goto yy47;
+yy168:
+		YYDEBUG(168, *YYCURSOR);
+		yyaccept = 9;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy169:
+		YYDEBUG(169, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_IDENT(T_DO);
 }
-yy137:
-	YYDEBUG(137, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'H') goto yy231;
-	if (yych == 'h') goto yy231;
-	goto yy40;
-yy138:
-	YYDEBUG(138, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy232;
-	if (yych == 's') goto yy232;
-	goto yy40;
-yy139:
-	YYDEBUG(139, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'P') goto yy233;
-	if (yych == 'p') goto yy233;
-	goto yy40;
-yy140:
-	YYDEBUG(140, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'U') {
-		if (yych == 'D') goto yy234;
-		if (yych <= 'T') goto yy40;
-		goto yy235;
-	} else {
-		if (yych <= 'd') {
-			if (yych <= 'c') goto yy40;
-			goto yy234;
-		} else {
-			if (yych == 'u') goto yy235;
-			goto yy40;
+yy170:
+		YYDEBUG(170, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'H') goto yy283;
+		if (yych == 'h') goto yy283;
+		goto yy47;
+yy171:
+		YYDEBUG(171, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy284;
+		if (yych == 's') goto yy284;
+		goto yy47;
+yy172:
+		YYDEBUG(172, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'P') goto yy285;
+		if (yych == 'p') goto yy285;
+		goto yy47;
+yy173:
+		YYDEBUG(173, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'U') {
+			if (yych == 'D') goto yy286;
+			if (yych <= 'T') goto yy47;
+			goto yy287;
+		} else {
+			if (yych <= 'd') {
+				if (yych <= 'c') goto yy47;
+				goto yy286;
+			} else {
+				if (yych == 'u') goto yy287;
+				goto yy47;
+			}
 		}
-	}
-yy141:
-	YYDEBUG(141, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy236;
-	if (yych == 'a') goto yy236;
-	goto yy40;
-yy142:
-	YYDEBUG(142, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'T') {
-		if (yych == 'I') goto yy237;
-		if (yych <= 'S') goto yy40;
-		goto yy238;
-	} else {
-		if (yych <= 'i') {
-			if (yych <= 'h') goto yy40;
-			goto yy237;
+yy174:
+		YYDEBUG(174, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy288;
+		if (yych == 'a') goto yy288;
+		goto yy47;
+yy175:
+		YYDEBUG(175, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'T') {
+			if (yych == 'I') goto yy289;
+			if (yych <= 'S') goto yy47;
+			goto yy290;
 		} else {
-			if (yych == 't') goto yy238;
-			goto yy40;
+			if (yych <= 'i') {
+				if (yych <= 'h') goto yy47;
+				goto yy289;
+			} else {
+				if (yych == 't') goto yy290;
+				goto yy47;
+			}
 		}
-	}
-yy143:
-	YYDEBUG(143, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy239;
-	if (yych == 'n') goto yy239;
-	goto yy40;
-yy144:
-	YYDEBUG(144, yych);
-	yyaccept = 10;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy145:
-	YYDEBUG(145, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy176:
+		YYDEBUG(176, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy291;
+		if (yych == 'n') goto yy291;
+		goto yy47;
+yy177:
+		YYDEBUG(177, *YYCURSOR);
+		yyaccept = 10;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy178:
+		YYDEBUG(178, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_IDENT(T_FN);
 }
-yy146:
-	YYDEBUG(146, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy240;
-	if (yych == 'r') goto yy240;
-	goto yy40;
-yy147:
-	YYDEBUG(147, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy242;
-	if (yych == 'n') goto yy242;
-	goto yy40;
-yy148:
-	YYDEBUG(148, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy243;
-	if (yych == 'o') goto yy243;
-	goto yy40;
-yy149:
-	YYDEBUG(149, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy244;
-	if (yych == 't') goto yy244;
-	goto yy40;
-yy150:
-	YYDEBUG(150, yych);
-	yyaccept = 11;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy151:
-	YYDEBUG(151, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy179:
+		YYDEBUG(179, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy292;
+		if (yych == 'r') goto yy292;
+		goto yy47;
+yy180:
+		YYDEBUG(180, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy294;
+		if (yych == 'n') goto yy294;
+		goto yy47;
+yy181:
+		YYDEBUG(181, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy295;
+		if (yych == 'o') goto yy295;
+		goto yy47;
+yy182:
+		YYDEBUG(182, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy296;
+		if (yych == 't') goto yy296;
+		goto yy47;
+yy183:
+		YYDEBUG(183, *YYCURSOR);
+		yyaccept = 11;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy184:
+		YYDEBUG(184, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_IDENT(T_IF);
 }
-yy152:
-	YYDEBUG(152, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'P') goto yy245;
-	if (yych == 'p') goto yy245;
-	goto yy40;
-yy153:
-	YYDEBUG(153, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'T') {
-		if (yych <= 'C') {
-			if (yych <= 'B') goto yy40;
-			goto yy246;
-		} else {
-			if (yych <= 'R') goto yy40;
-			if (yych <= 'S') goto yy247;
-			goto yy248;
+yy185:
+		YYDEBUG(185, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'P') goto yy297;
+		if (yych == 'p') goto yy297;
+		goto yy47;
+yy186:
+		YYDEBUG(186, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'T') {
+			if (yych <= 'C') {
+				if (yych <= 'B') goto yy47;
+				goto yy298;
+			} else {
+				if (yych <= 'R') goto yy47;
+				if (yych <= 'S') goto yy299;
+				goto yy300;
+			}
+		} else {
+			if (yych <= 'r') {
+				if (yych == 'c') goto yy298;
+				goto yy47;
+			} else {
+				if (yych <= 's') goto yy299;
+				if (yych <= 't') goto yy300;
+				goto yy47;
+			}
 		}
-	} else {
-		if (yych <= 'r') {
-			if (yych == 'c') goto yy246;
-			goto yy40;
-		} else {
-			if (yych <= 's') goto yy247;
-			if (yych <= 't') goto yy248;
-			goto yy40;
+yy187:
+		YYDEBUG(187, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy301;
+		if (yych == 's') goto yy301;
+		goto yy47;
+yy188:
+		YYDEBUG(188, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy302;
+		if (yych == 's') goto yy302;
+		goto yy47;
+yy189:
+		YYDEBUG(189, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy303;
+		if (yych == 't') goto yy303;
+		goto yy47;
+yy190:
+		YYDEBUG(190, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'M') goto yy304;
+		if (yych == 'm') goto yy304;
+		goto yy47;
+yy191:
+		YYDEBUG(191, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'W') goto yy305;
+		if (yych == 'w') goto yy305;
+		goto yy47;
+yy192:
+		YYDEBUG(192, *YYCURSOR);
+		yyaccept = 12;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
 		}
-	}
-yy154:
-	YYDEBUG(154, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy249;
-	if (yych == 's') goto yy249;
-	goto yy40;
-yy155:
-	YYDEBUG(155, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy250;
-	if (yych == 's') goto yy250;
-	goto yy40;
-yy156:
-	YYDEBUG(156, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy251;
-	if (yych == 't') goto yy251;
-	goto yy40;
-yy157:
-	YYDEBUG(157, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'M') goto yy252;
-	if (yych == 'm') goto yy252;
-	goto yy40;
-yy158:
-	YYDEBUG(158, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'W') goto yy253;
-	if (yych == 'w') goto yy253;
-	goto yy40;
-yy159:
-	YYDEBUG(159, yych);
-	yyaccept = 12;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy160:
-	YYDEBUG(160, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+		if (yych == '\\') goto yy160;
+yy193:
+		YYDEBUG(193, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_IDENT(T_LOGICAL_OR);
 }
-yy161:
-	YYDEBUG(161, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'O') {
-		if (yych == 'I') goto yy255;
-		if (yych <= 'N') goto yy40;
-		goto yy256;
-	} else {
-		if (yych <= 'i') {
-			if (yych <= 'h') goto yy40;
-			goto yy255;
+yy194:
+		YYDEBUG(194, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'O') {
+			if (yych == 'I') goto yy307;
+			if (yych <= 'N') goto yy47;
+			goto yy308;
 		} else {
-			if (yych == 'o') goto yy256;
-			goto yy40;
-		}
-	}
-yy162:
-	YYDEBUG(162, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'B') goto yy257;
-	if (yych == 'b') goto yy257;
-	goto yy40;
-yy163:
-	YYDEBUG(163, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'T') {
-		if (yych <= 'P') {
-			if (yych == 'A') goto yy258;
-			goto yy40;
-		} else {
-			if (yych <= 'Q') goto yy259;
-			if (yych <= 'S') goto yy40;
-			goto yy260;
-		}
-	} else {
-		if (yych <= 'p') {
-			if (yych == 'a') goto yy258;
-			goto yy40;
-		} else {
-			if (yych <= 'q') goto yy259;
-			if (yych == 't') goto yy260;
-			goto yy40;
+			if (yych <= 'i') {
+				if (yych <= 'h') goto yy47;
+				goto yy307;
+			} else {
+				if (yych == 'o') goto yy308;
+				goto yy47;
+			}
 		}
-	}
-yy164:
-	YYDEBUG(164, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy261;
-	if (yych == 'a') goto yy261;
-	goto yy40;
-yy165:
-	YYDEBUG(165, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy262;
-	if (yych == 'i') goto yy262;
-	goto yy40;
-yy166:
-	YYDEBUG(166, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy263;
-	if (yych == 'r') goto yy263;
-	goto yy40;
-yy167:
-	YYDEBUG(167, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'Y') {
-		if (yych == 'A') goto yy264;
-		if (yych <= 'X') goto yy40;
-		goto yy265;
-	} else {
-		if (yych <= 'a') {
-			if (yych <= '`') goto yy40;
-			goto yy264;
+yy195:
+		YYDEBUG(195, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'B') goto yy309;
+		if (yych == 'b') goto yy309;
+		goto yy47;
+yy196:
+		YYDEBUG(196, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'T') {
+			if (yych <= 'P') {
+				if (yych == 'A') goto yy310;
+				goto yy47;
+			} else {
+				if (yych <= 'Q') goto yy311;
+				if (yych <= 'S') goto yy47;
+				goto yy312;
+			}
 		} else {
-			if (yych == 'y') goto yy265;
-			goto yy40;
+			if (yych <= 'p') {
+				if (yych == 'a') goto yy310;
+				goto yy47;
+			} else {
+				if (yych <= 'q') goto yy311;
+				if (yych == 't') goto yy312;
+				goto yy47;
+			}
 		}
-	}
-yy168:
-	YYDEBUG(168, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy267;
-	if (yych == 's') goto yy267;
-	goto yy40;
-yy169:
-	YYDEBUG(169, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy268;
-	if (yych == 'e') goto yy268;
-	goto yy40;
-yy170:
-	YYDEBUG(170, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy270;
-	if (yych == 'r') goto yy270;
-	goto yy40;
-yy171:
-	YYDEBUG(171, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy272;
-	if (yych == 'i') goto yy272;
-	goto yy40;
-yy172:
-	YYDEBUG(172, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy273;
-	if (yych == 'r') goto yy273;
-	goto yy40;
-yy173:
-	YYDEBUG(173, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy275;
-	if (yych == 'e') goto yy275;
-	goto yy40;
-yy174:
-	YYDEBUG(174, yych);
-	yyaccept = 13;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\\') {
-		if (yych <= '@') {
-			if (yych <= '/') goto yy175;
-			if (yych <= '9') goto yy174;
-		} else {
-			if (yych <= 'Z') goto yy174;
-			if (yych >= '\\') goto yy276;
+yy197:
+		YYDEBUG(197, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy313;
+		if (yych == 'a') goto yy313;
+		goto yy47;
+yy198:
+		YYDEBUG(198, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy314;
+		if (yych == 'i') goto yy314;
+		goto yy47;
+yy199:
+		YYDEBUG(199, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy315;
+		if (yych == 'r') goto yy315;
+		goto yy47;
+yy200:
+		YYDEBUG(200, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'Y') {
+			if (yych == 'A') goto yy316;
+			if (yych <= 'X') goto yy47;
+			goto yy317;
+		} else {
+			if (yych <= 'a') {
+				if (yych <= '`') goto yy47;
+				goto yy316;
+			} else {
+				if (yych == 'y') goto yy317;
+				goto yy47;
+			}
 		}
-	} else {
-		if (yych <= '`') {
-			if (yych == '_') goto yy174;
+yy201:
+		YYDEBUG(201, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy319;
+		if (yych == 's') goto yy319;
+		goto yy47;
+yy202:
+		YYDEBUG(202, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy320;
+		if (yych == 'e') goto yy320;
+		goto yy47;
+yy203:
+		YYDEBUG(203, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy322;
+		if (yych == 'r') goto yy322;
+		goto yy47;
+yy204:
+		YYDEBUG(204, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy324;
+		if (yych == 'i') goto yy324;
+		goto yy47;
+yy205:
+		YYDEBUG(205, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy325;
+		if (yych == 'r') goto yy325;
+		goto yy47;
+yy206:
+		YYDEBUG(206, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy327;
+		if (yych == 'e') goto yy327;
+		goto yy47;
+yy207:
+		YYDEBUG(207, *YYCURSOR);
+		yyaccept = 13;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(208, *YYCURSOR);
+		if (yych <= '\\') {
+			if (yych <= '@') {
+				if (yych <= '/') goto yy209;
+				if (yych <= '9') goto yy207;
+			} else {
+				if (yych <= 'Z') goto yy207;
+				if (yych >= '\\') goto yy328;
+			}
 		} else {
-			if (yych <= 'z') goto yy174;
-			if (yych >= 0x80) goto yy174;
+			if (yych <= '`') {
+				if (yych == '_') goto yy207;
+			} else {
+				if (yych <= 'z') goto yy207;
+				if (yych >= 0x80) goto yy207;
+			}
 		}
-	}
-yy175:
-	YYDEBUG(175, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy209:
+		YYDEBUG(209, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_STR(T_NAME_FULLY_QUALIFIED, 1);
 }
-yy176:
-	YYDEBUG(176, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy210:
+		YYDEBUG(210, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(211, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_XOR_EQUAL);
 }
-yy177:
-	YYDEBUG(177, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch (yych) {
+yy212:
+		YYDEBUG(212, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		switch (yych) {
 		case 'C':
-		case 'c': goto yy277;
+		case 'c':	goto yy329;
 		case 'D':
-		case 'd': goto yy278;
+		case 'd':	goto yy330;
 		case 'F':
-		case 'f': goto yy279;
+		case 'f':	goto yy331;
 		case 'H':
-		case 'h': goto yy280;
+		case 'h':	goto yy332;
 		case 'L':
-		case 'l': goto yy281;
+		case 'l':	goto yy333;
 		case 'M':
-		case 'm': goto yy282;
+		case 'm':	goto yy334;
 		case 'N':
-		case 'n': goto yy283;
+		case 'n':	goto yy335;
 		case 'T':
-		case 't': goto yy284;
-		default: goto yy40;
-	}
-yy178:
-	YYDEBUG(178, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+		case 't':	goto yy336;
+		default:	goto yy47;
+		}
+yy213:
+		YYDEBUG(213, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(214, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_OR_EQUAL);
 }
-yy179:
-	YYDEBUG(179, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy215:
+		YYDEBUG(215, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(216, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_BOOLEAN_OR);
 }
-yy180:
-	YYDEBUG(180, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy217:
+		YYDEBUG(217, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(218, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_IS_NOT_IDENTICAL);
 }
-yy181:
-	YYDEBUG(181, yych);
-	yych = *++YYCURSOR;
-	if (yych == '.') goto yy72;
-	goto yy71;
-yy182:
-	YYDEBUG(182, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy285;
-	if (yych == 'r') goto yy285;
-	goto yy71;
-yy183:
-	YYDEBUG(183, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy286;
-	if (yych == 'n') goto yy286;
-	goto yy71;
-yy184:
-	YYDEBUG(184, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy287;
-	if (yych == 'o') goto yy287;
-	goto yy71;
-yy185:
-	YYDEBUG(185, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'U') goto yy288;
-	if (yych == 'u') goto yy288;
-	goto yy71;
-yy186:
-	YYDEBUG(186, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy289;
-	if (yych == 'o') goto yy289;
-	goto yy71;
-yy187:
-	YYDEBUG(187, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy290;
-	if (yych == 't') goto yy290;
-	goto yy71;
-yy188:
-	YYDEBUG(188, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'J') goto yy291;
-	if (yych == 'j') goto yy291;
-	goto yy71;
-yy189:
-	YYDEBUG(189, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy292;
-	if (yych == 'a') goto yy292;
-	goto yy71;
-yy190:
-	YYDEBUG(190, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy293;
-	if (yych == 'r') goto yy293;
-	goto yy71;
-yy191:
-	YYDEBUG(191, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy294;
-	if (yych == 's') goto yy294;
-	goto yy71;
-yy192:
-	YYDEBUG(192, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy219:
+		YYDEBUG(219, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '.') goto yy86;
+		goto yy85;
+yy220:
+		YYDEBUG(220, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'R') goto yy337;
+		if (yych == 'r') goto yy337;
+		goto yy85;
+yy221:
+		YYDEBUG(221, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'N') goto yy338;
+		if (yych == 'n') goto yy338;
+		goto yy85;
+yy222:
+		YYDEBUG(222, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'O') goto yy339;
+		if (yych == 'o') goto yy339;
+		goto yy85;
+yy223:
+		YYDEBUG(223, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'U') goto yy340;
+		if (yych == 'u') goto yy340;
+		goto yy85;
+yy224:
+		YYDEBUG(224, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'O') goto yy341;
+		if (yych == 'o') goto yy341;
+		goto yy85;
+yy225:
+		YYDEBUG(225, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'T') goto yy342;
+		if (yych == 't') goto yy342;
+		goto yy85;
+yy226:
+		YYDEBUG(226, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'J') goto yy343;
+		if (yych == 'j') goto yy343;
+		goto yy85;
+yy227:
+		YYDEBUG(227, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'A') goto yy344;
+		if (yych == 'a') goto yy344;
+		goto yy85;
+yy228:
+		YYDEBUG(228, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'R') goto yy345;
+		if (yych == 'r') goto yy345;
+		goto yy85;
+yy229:
+		YYDEBUG(229, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'S') goto yy346;
+		if (yych == 's') goto yy346;
+		goto yy85;
+yy230:
+		YYDEBUG(230, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(231, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_POW_EQUAL);
 }
-yy193:
-	YYDEBUG(193, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy232:
+		YYDEBUG(232, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(233, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_ELLIPSIS);
 }
-yy194:
-	YYDEBUG(194, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '/') goto yy71;
-	if (yych <= '9') goto yy95;
-	goto yy71;
-yy195:
-	YYDEBUG(195, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '\f') {
-		if (yych <= 0x08) goto yy71;
-		if (yych <= '\n') goto yy295;
-		goto yy71;
-	} else {
-		if (yych <= '\r') goto yy295;
-		if (yych == ' ') goto yy295;
-		goto yy71;
-	}
-yy196:
-	YYDEBUG(196, yych);
-	yyaccept = 14;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 32) goto yy196;
-	if (yych == '_') goto yy104;
-yy197:
-	YYDEBUG(197, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy234:
+		YYDEBUG(234, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '/') goto yy85;
+		if (yych <= '9') goto yy119;
+		goto yy85;
+yy235:
+		YYDEBUG(235, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\f') {
+			if (yych <= 0x08) goto yy85;
+			if (yych <= '\n') goto yy347;
+			goto yy85;
+		} else {
+			if (yych <= '\r') goto yy347;
+			if (yych == ' ') goto yy347;
+			goto yy85;
+		}
+yy236:
+		YYDEBUG(236, *YYCURSOR);
+		yyaccept = 14;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(237, *YYCURSOR);
+		if (yybm[0+yych] & 32) {
+			goto yy236;
+		}
+		if (yych == '_') goto yy130;
+yy238:
+		YYDEBUG(238, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	/* The +/- 2 skips "0b" */
 	size_t len = yyleng - 2;
 	char *end, *bin = yytext + 2;
@@ -4166,35 +4107,39 @@
 		RETURN_TOKEN_WITH_VAL(T_DNUMBER);
 	}
 }
-yy198:
-	YYDEBUG(198, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '/') goto yy71;
-	if (yych >= ':') goto yy71;
-yy199:
-	YYDEBUG(199, yych);
-	yyaccept = 5;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '/') goto yy97;
-	if (yych <= '9') goto yy199;
-	if (yych == '_') goto yy198;
-	goto yy97;
-yy200:
-	YYDEBUG(200, yych);
-	yyaccept = 15;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 64) goto yy200;
-	if (yych == '_') goto yy106;
-yy201:
-	YYDEBUG(201, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy239:
+		YYDEBUG(239, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '/') goto yy85;
+		if (yych >= ':') goto yy85;
+yy240:
+		YYDEBUG(240, *YYCURSOR);
+		yyaccept = 5;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(241, *YYCURSOR);
+		if (yych <= '/') goto yy121;
+		if (yych <= '9') goto yy240;
+		if (yych == '_') goto yy239;
+		goto yy121;
+yy242:
+		YYDEBUG(242, *YYCURSOR);
+		yyaccept = 15;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(243, *YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy242;
+		}
+		if (yych == '_') goto yy132;
+yy244:
+		YYDEBUG(244, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	/* The +/- 2 skips "0o" */
 	size_t len = yyleng - 2;
 	char *end, *octal = yytext + 2;
@@ -4243,18 +4188,21 @@
 	}
 	RETURN_TOKEN_WITH_VAL(T_DNUMBER);
 }
-yy202:
-	YYDEBUG(202, yych);
-	yyaccept = 16;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 128) goto yy202;
-	if (yych == '_') goto yy107;
-yy203:
-	YYDEBUG(203, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy245:
+		YYDEBUG(245, *YYCURSOR);
+		yyaccept = 16;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(246, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy245;
+		}
+		if (yych == '_') goto yy133;
+yy247:
+		YYDEBUG(247, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	/* The +/- 2 skips "0x" */
 	size_t len = yyleng - 2;
 	char *end, *hex = yytext + 2;
@@ -4295,1399 +4243,1438 @@
 		RETURN_TOKEN_WITH_VAL(T_DNUMBER);
 	}
 }
-yy204:
-	YYDEBUG(204, yych);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yych <= '\'') {
-		if (yych <= ' ') {
-			if (yych == '\t') goto yy204;
-			if (yych <= 0x1F) goto yy71;
-			goto yy204;
-		} else {
-			if (yych == '"') goto yy296;
-			if (yych <= '&') goto yy71;
-			goto yy297;
-		}
-	} else {
-		if (yych <= '_') {
-			if (yych <= '@') goto yy71;
-			if (yych <= 'Z') goto yy298;
-			if (yych <= '^') goto yy71;
-			goto yy298;
-		} else {
-			if (yych <= '`') goto yy71;
-			if (yych <= 'z') goto yy298;
-			if (yych <= 0x7F) goto yy71;
-			goto yy298;
+yy248:
+		YYDEBUG(248, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(249, *YYCURSOR);
+		if (yych <= '\'') {
+			if (yych <= ' ') {
+				if (yych == '\t') goto yy248;
+				if (yych <= 0x1F) goto yy85;
+				goto yy248;
+			} else {
+				if (yych == '"') goto yy349;
+				if (yych <= '&') goto yy85;
+				goto yy350;
+			}
+		} else {
+			if (yych <= '_') {
+				if (yych <= '@') goto yy85;
+				if (yych <= 'Z') goto yy351;
+				if (yych <= '^') goto yy85;
+				goto yy351;
+			} else {
+				if (yych <= '`') goto yy85;
+				if (yych <= 'z') goto yy351;
+				if (yych <= 0x7F) goto yy85;
+				goto yy351;
+			}
 		}
-	}
-yy205:
-	YYDEBUG(205, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy250:
+		YYDEBUG(250, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(251, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_SL_EQUAL);
 }
-yy206:
-	YYDEBUG(206, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy252:
+		YYDEBUG(252, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(253, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_SPACESHIP);
 }
-yy207:
-	YYDEBUG(207, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy254:
+		YYDEBUG(254, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(255, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_IS_IDENTICAL);
 }
-yy208:
-	YYDEBUG(208, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy256:
+		YYDEBUG(256, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(257, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_SR_EQUAL);
 }
-yy209:
-	YYDEBUG(209, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy258:
+		YYDEBUG(258, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(259, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
 	RETURN_TOKEN(T_NULLSAFE_OBJECT_OPERATOR);
 }
-yy210:
-	YYDEBUG(210, yych);
-	++YYCURSOR;
-	goto yy120;
-yy211:
-	YYDEBUG(211, yych);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy210;
-	goto yy120;
-yy212:
-	YYDEBUG(212, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN(T_COALESCE_EQUAL);
-}
-yy213:
-	YYDEBUG(213, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy299;
-	if (yych == 't') goto yy299;
-	goto yy40;
-yy214:
-	YYDEBUG(214, yych);
-	yyaccept = 17;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy215:
-	YYDEBUG(215, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_LOGICAL_AND);
-}
-yy216:
-	YYDEBUG(216, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy300;
-	if (yych == 'a') goto yy300;
-	goto yy40;
-yy217:
-	YYDEBUG(217, yych);
-	yyaccept = 18;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\\') {
-		if (yych <= '@') {
-			if (yych <= '/') goto yy218;
-			if (yych <= '9') goto yy217;
-		} else {
-			if (yych <= 'Z') goto yy217;
-			if (yych >= '\\') goto yy127;
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych == '_') goto yy217;
-		} else {
-			if (yych <= 'z') goto yy217;
-			if (yych >= 0x80) goto yy217;
-		}
-	}
-yy218:
-	YYDEBUG(218, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_STR(T_NAME_QUALIFIED, 0);
-}
-yy219:
-	YYDEBUG(219, yych);
-	yych = *++YYCURSOR;
-	if (yych == '<') goto yy204;
-	goto yy71;
-yy220:
-	YYDEBUG(220, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy301;
-	if (yych == 'a') goto yy301;
-	goto yy40;
-yy221:
-	YYDEBUG(221, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy302;
-	if (yych == 'l') goto yy302;
-	goto yy40;
-yy222:
-	YYDEBUG(222, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy303;
-	if (yych == 'e') goto yy303;
-	goto yy40;
-yy223:
-	YYDEBUG(223, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy305;
-	if (yych == 'c') goto yy305;
-	goto yy40;
-yy224:
-	YYDEBUG(224, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy306;
-	if (yych == 's') goto yy306;
-	goto yy40;
-yy225:
-	YYDEBUG(225, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy307;
-	if (yych == 'n') goto yy307;
-	goto yy40;
-yy226:
-	YYDEBUG(226, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'T') {
-		if (yych <= 'R') goto yy40;
-		if (yych <= 'S') goto yy308;
-		goto yy309;
-	} else {
-		if (yych <= 'r') goto yy40;
-		if (yych <= 's') goto yy308;
-		if (yych <= 't') goto yy309;
-		goto yy40;
-	}
-yy227:
-	YYDEBUG(227, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy310;
-	if (yych == 'l') goto yy310;
-	goto yy40;
-yy228:
-	YYDEBUG(228, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy311;
-	if (yych == 'a') goto yy311;
-	goto yy40;
-yy229:
-	YYDEBUG(229, yych);
-	yyaccept = 19;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy230:
-	YYDEBUG(230, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_EXIT);
-}
-yy231:
-	YYDEBUG(231, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy312;
-	if (yych == 'o') goto yy312;
-	goto yy40;
-yy232:
-	YYDEBUG(232, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy314;
-	if (yych == 'e') goto yy314;
-	goto yy40;
-yy233:
-	YYDEBUG(233, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy316;
-	if (yych == 't') goto yy316;
-	goto yy40;
-yy234:
-	YYDEBUG(234, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	switch (yych) {
-		case 'D':
-		case 'd': goto yy317;
-		case 'F':
-		case 'f': goto yy318;
-		case 'I':
-		case 'i': goto yy319;
-		case 'S':
-		case 's': goto yy320;
-		case 'W':
-		case 'w': goto yy321;
-		default: goto yy40;
-	}
-yy235:
-	YYDEBUG(235, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'M') goto yy322;
-	if (yych == 'm') goto yy322;
-	goto yy40;
-yy236:
-	YYDEBUG(236, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy323;
-	if (yych == 'l') goto yy323;
-	goto yy40;
-yy237:
-	YYDEBUG(237, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy325;
-	if (yych == 't') goto yy325;
-	goto yy40;
-yy238:
-	YYDEBUG(238, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy327;
-	if (yych == 'e') goto yy327;
-	goto yy40;
-yy239:
-	YYDEBUG(239, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy328;
-	if (yych == 'a') goto yy328;
-	goto yy40;
-yy240:
-	YYDEBUG(240, yych);
-	yyaccept = 20;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '\\') {
-		if (yych <= 'D') {
-			if (yych <= '/') goto yy241;
-			if (yych <= '9') goto yy39;
-			if (yych >= 'A') goto yy39;
-		} else {
-			if (yych <= 'E') goto yy329;
-			if (yych <= 'Z') goto yy39;
-			if (yych >= '\\') goto yy127;
-		}
-	} else {
-		if (yych <= 'd') {
-			if (yych == '_') goto yy39;
-			if (yych >= 'a') goto yy39;
-		} else {
-			if (yych <= 'e') goto yy329;
-			if (yych <= 'z') goto yy39;
-			if (yych >= 0x80) goto yy39;
-		}
-	}
-yy241:
-	YYDEBUG(241, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_FOR);
-}
-yy242:
-	YYDEBUG(242, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy330;
-	if (yych == 'c') goto yy330;
-	goto yy40;
-yy243:
-	YYDEBUG(243, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'B') goto yy331;
-	if (yych == 'b') goto yy331;
-	goto yy40;
-yy244:
-	YYDEBUG(244, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy332;
-	if (yych == 'o') goto yy332;
-	goto yy40;
-yy245:
-	YYDEBUG(245, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy334;
-	if (yych == 'l') goto yy334;
-	goto yy40;
-yy246:
-	YYDEBUG(246, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy335;
-	if (yych == 'l') goto yy335;
-	goto yy40;
-yy247:
-	YYDEBUG(247, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy336;
-	if (yych == 't') goto yy336;
-	goto yy40;
-yy248:
-	YYDEBUG(248, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy337;
-	if (yych == 'e') goto yy337;
-	goto yy40;
-yy249:
-	YYDEBUG(249, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy338;
-	if (yych == 'e') goto yy338;
-	goto yy40;
-yy250:
-	YYDEBUG(250, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy339;
-	if (yych == 't') goto yy339;
-	goto yy40;
-yy251:
-	YYDEBUG(251, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy341;
-	if (yych == 'c') goto yy341;
-	goto yy40;
-yy252:
-	YYDEBUG(252, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy342;
-	if (yych == 'e') goto yy342;
-	goto yy40;
-yy253:
-	YYDEBUG(253, yych);
-	yyaccept = 21;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy254:
-	YYDEBUG(254, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_NEW);
-}
-yy255:
-	YYDEBUG(255, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'V') {
-		if (yych == 'N') goto yy343;
-		if (yych <= 'U') goto yy40;
-		goto yy344;
-	} else {
-		if (yych <= 'n') {
-			if (yych <= 'm') goto yy40;
-			goto yy343;
-		} else {
-			if (yych == 'v') goto yy344;
-			goto yy40;
-		}
-	}
-yy256:
-	YYDEBUG(256, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy345;
-	if (yych == 't') goto yy345;
-	goto yy40;
-yy257:
-	YYDEBUG(257, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy346;
-	if (yych == 'l') goto yy346;
-	goto yy40;
-yy258:
-	YYDEBUG(258, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy347;
-	if (yych == 'd') goto yy347;
-	goto yy40;
-yy259:
-	YYDEBUG(259, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'U') goto yy348;
-	if (yych == 'u') goto yy348;
-	goto yy40;
 yy260:
-	YYDEBUG(260, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'U') goto yy349;
-	if (yych == 'u') goto yy349;
-	goto yy40;
+		YYDEBUG(260, *YYCURSOR);
+		++YYCURSOR;
+		goto yy152;
 yy261:
-	YYDEBUG(261, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy350;
-	if (yych == 't') goto yy350;
-	goto yy40;
+		YYDEBUG(261, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy260;
+		goto yy152;
 yy262:
-	YYDEBUG(262, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy351;
-	if (yych == 't') goto yy351;
-	goto yy40;
-yy263:
-	YYDEBUG(263, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy352;
-	if (yych == 'o') goto yy352;
-	goto yy40;
+		YYDEBUG(262, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(263, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN(T_COALESCE_EQUAL);
+}
 yy264:
-	YYDEBUG(264, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy353;
-	if (yych == 'i') goto yy353;
-	goto yy40;
+		YYDEBUG(264, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy353;
+		if (yych == 't') goto yy353;
+		goto yy47;
 yy265:
-	YYDEBUG(265, yych);
-	yyaccept = 22;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(265, *YYCURSOR);
+		yyaccept = 17;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy266:
-	YYDEBUG(266, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_TRY);
+		YYDEBUG(266, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_LOGICAL_AND);
 }
 yy267:
-	YYDEBUG(267, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy354;
-	if (yych == 'e') goto yy354;
-	goto yy40;
+		YYDEBUG(267, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy354;
+		if (yych == 'a') goto yy354;
+		goto yy47;
 yy268:
-	YYDEBUG(268, yych);
-	yyaccept = 23;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy269:
-	YYDEBUG(269, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_USE);
-}
+		YYDEBUG(268, *YYCURSOR);
+		yyaccept = 18;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(269, *YYCURSOR);
+		if (yych <= '\\') {
+			if (yych <= '@') {
+				if (yych <= '/') goto yy270;
+				if (yych <= '9') goto yy268;
+			} else {
+				if (yych <= 'Z') goto yy268;
+				if (yych >= '\\') goto yy160;
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych == '_') goto yy268;
+			} else {
+				if (yych <= 'z') goto yy268;
+				if (yych >= 0x80) goto yy268;
+			}
+		}
 yy270:
-	YYDEBUG(270, yych);
-	yyaccept = 24;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy271:
-	YYDEBUG(271, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_VAR);
+		YYDEBUG(270, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_STR(T_NAME_QUALIFIED, 0);
 }
+yy271:
+		YYDEBUG(271, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '<') goto yy248;
+		goto yy85;
 yy272:
-	YYDEBUG(272, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy355;
-	if (yych == 'l') goto yy355;
-	goto yy40;
+		YYDEBUG(272, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy355;
+		if (yych == 'a') goto yy355;
+		goto yy47;
 yy273:
-	YYDEBUG(273, yych);
-	yyaccept = 25;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(273, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy356;
+		if (yych == 'l') goto yy356;
+		goto yy47;
 yy274:
-	YYDEBUG(274, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_LOGICAL_XOR);
-}
+		YYDEBUG(274, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy357;
+		if (yych == 'e') goto yy357;
+		goto yy47;
 yy275:
-	YYDEBUG(275, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy356;
-	if (yych == 'l') goto yy356;
-	goto yy40;
+		YYDEBUG(275, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy359;
+		if (yych == 'c') goto yy359;
+		goto yy47;
 yy276:
-	YYDEBUG(276, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy71;
-		if (yych <= 'Z') goto yy174;
-		if (yych <= '^') goto yy71;
-		goto yy174;
-	} else {
-		if (yych <= '`') goto yy71;
-		if (yych <= 'z') goto yy174;
-		if (yych <= 0x7F) goto yy71;
-		goto yy174;
-	}
+		YYDEBUG(276, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy360;
+		if (yych == 's') goto yy360;
+		goto yy47;
 yy277:
-	YYDEBUG(277, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy357;
-	if (yych == 'l') goto yy357;
-	goto yy40;
+		YYDEBUG(277, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy361;
+		if (yych == 'n') goto yy361;
+		goto yy47;
 yy278:
-	YYDEBUG(278, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy358;
-	if (yych == 'i') goto yy358;
-	goto yy40;
-yy279:
-	YYDEBUG(279, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'U') {
-		if (yych == 'I') goto yy359;
-		if (yych <= 'T') goto yy40;
-		goto yy360;
-	} else {
-		if (yych <= 'i') {
-			if (yych <= 'h') goto yy40;
-			goto yy359;
-		} else {
-			if (yych == 'u') goto yy360;
-			goto yy40;
+		YYDEBUG(278, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'T') {
+			if (yych <= 'R') goto yy47;
+			if (yych <= 'S') goto yy362;
+			goto yy363;
+		} else {
+			if (yych <= 'r') goto yy47;
+			if (yych <= 's') goto yy362;
+			if (yych <= 't') goto yy363;
+			goto yy47;
 		}
-	}
+yy279:
+		YYDEBUG(279, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy364;
+		if (yych == 'l') goto yy364;
+		goto yy47;
 yy280:
-	YYDEBUG(280, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy361;
-	if (yych == 'a') goto yy361;
-	goto yy40;
+		YYDEBUG(280, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy365;
+		if (yych == 'a') goto yy365;
+		goto yy47;
 yy281:
-	YYDEBUG(281, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy362;
-	if (yych == 'i') goto yy362;
-	goto yy40;
+		YYDEBUG(281, *YYCURSOR);
+		yyaccept = 19;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy282:
-	YYDEBUG(282, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy363;
-	if (yych == 'e') goto yy363;
-	goto yy40;
+		YYDEBUG(282, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_EXIT);
+}
 yy283:
-	YYDEBUG(283, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy364;
-	if (yych == 'a') goto yy364;
-	goto yy40;
+		YYDEBUG(283, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy366;
+		if (yych == 'o') goto yy366;
+		goto yy47;
 yy284:
-	YYDEBUG(284, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy365;
-	if (yych == 'r') goto yy365;
-	goto yy40;
+		YYDEBUG(284, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy368;
+		if (yych == 'e') goto yy368;
+		goto yy47;
 yy285:
-	YYDEBUG(285, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy366;
-	if (yych == 'a') goto yy366;
-	goto yy71;
+		YYDEBUG(285, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy370;
+		if (yych == 't') goto yy370;
+		goto yy47;
 yy286:
-	YYDEBUG(286, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy367;
-	if (yych == 'a') goto yy367;
-	goto yy71;
+		YYDEBUG(286, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		switch (yych) {
+		case 'D':
+		case 'd':	goto yy371;
+		case 'F':
+		case 'f':	goto yy372;
+		case 'I':
+		case 'i':	goto yy373;
+		case 'S':
+		case 's':	goto yy374;
+		case 'W':
+		case 'w':	goto yy375;
+		default:	goto yy47;
+		}
 yy287:
-	YYDEBUG(287, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy368;
-	if (yych == 'l') goto yy368;
-	goto yy71;
+		YYDEBUG(287, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'M') goto yy376;
+		if (yych == 'm') goto yy376;
+		goto yy47;
 yy288:
-	YYDEBUG(288, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'B') goto yy369;
-	if (yych == 'b') goto yy369;
-	goto yy71;
+		YYDEBUG(288, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy377;
+		if (yych == 'l') goto yy377;
+		goto yy47;
 yy289:
-	YYDEBUG(289, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy370;
-	if (yych == 'a') goto yy370;
-	goto yy71;
+		YYDEBUG(289, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy379;
+		if (yych == 't') goto yy379;
+		goto yy47;
 yy290:
-	YYDEBUG(290, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy373;
-	if (yych == 'e') goto yy373;
-	goto yy372;
+		YYDEBUG(290, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy381;
+		if (yych == 'e') goto yy381;
+		goto yy47;
 yy291:
-	YYDEBUG(291, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy374;
-	if (yych == 'e') goto yy374;
-	goto yy71;
+		YYDEBUG(291, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy382;
+		if (yych == 'a') goto yy382;
+		goto yy47;
 yy292:
-	YYDEBUG(292, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy375;
-	if (yych == 'l') goto yy375;
-	goto yy71;
+		YYDEBUG(292, *YYCURSOR);
+		yyaccept = 20;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\\') {
+			if (yych <= 'D') {
+				if (yych <= '/') goto yy293;
+				if (yych <= '9') goto yy46;
+				if (yych >= 'A') goto yy46;
+			} else {
+				if (yych <= 'E') goto yy383;
+				if (yych <= 'Z') goto yy46;
+				if (yych >= '\\') goto yy160;
+			}
+		} else {
+			if (yych <= 'd') {
+				if (yych == '_') goto yy46;
+				if (yych >= 'a') goto yy46;
+			} else {
+				if (yych <= 'e') goto yy383;
+				if (yych <= 'z') goto yy46;
+				if (yych >= 0x80) goto yy46;
+			}
+		}
 yy293:
-	YYDEBUG(293, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'I') goto yy376;
-	if (yych == 'i') goto yy376;
-	goto yy71;
+		YYDEBUG(293, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_FOR);
+}
 yy294:
-	YYDEBUG(294, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy377;
-	if (yych == 'e') goto yy377;
-	goto yy71;
+		YYDEBUG(294, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy384;
+		if (yych == 'c') goto yy384;
+		goto yy47;
 yy295:
-	YYDEBUG(295, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\f') {
-		if (yych <= 0x08) goto yy100;
-		if (yych <= '\n') goto yy295;
-		goto yy100;
-	} else {
-		if (yych <= '\r') goto yy295;
-		if (yych == ' ') goto yy295;
-		goto yy100;
-	}
+		YYDEBUG(295, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'B') goto yy385;
+		if (yych == 'b') goto yy385;
+		goto yy47;
 yy296:
-	YYDEBUG(296, yych);
-	yych = *++YYCURSOR;
-	if (yych == '"') goto yy71;
-	if (yych <= '/') goto yy379;
-	if (yych <= '9') goto yy71;
-	goto yy379;
+		YYDEBUG(296, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy386;
+		if (yych == 'o') goto yy386;
+		goto yy47;
 yy297:
-	YYDEBUG(297, yych);
-	yych = *++YYCURSOR;
-	if (yych == '\'') goto yy71;
-	if (yych <= '/') goto yy381;
-	if (yych <= '9') goto yy71;
-	goto yy381;
+		YYDEBUG(297, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy388;
+		if (yych == 'l') goto yy388;
+		goto yy47;
 yy298:
-	YYDEBUG(298, yych);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yych <= '@') {
-		if (yych <= '\f') {
-			if (yych == '\n') goto yy382;
-			goto yy71;
-		} else {
-			if (yych <= '\r') goto yy384;
-			if (yych <= '/') goto yy71;
-			if (yych <= '9') goto yy298;
-			goto yy71;
-		}
-	} else {
-		if (yych <= '_') {
-			if (yych <= 'Z') goto yy298;
-			if (yych <= '^') goto yy71;
-			goto yy298;
-		} else {
-			if (yych <= '`') goto yy71;
-			if (yych <= 'z') goto yy298;
-			if (yych <= 0x7F) goto yy71;
-			goto yy298;
-		}
-	}
+		YYDEBUG(298, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy389;
+		if (yych == 'l') goto yy389;
+		goto yy47;
 yy299:
-	YYDEBUG(299, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy385;
-	if (yych == 'r') goto yy385;
-	goto yy40;
+		YYDEBUG(299, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy390;
+		if (yych == 't') goto yy390;
+		goto yy47;
 yy300:
-	YYDEBUG(300, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'Y') goto yy386;
-	if (yych == 'y') goto yy386;
-	goto yy40;
+		YYDEBUG(300, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy391;
+		if (yych == 'e') goto yy391;
+		goto yy47;
 yy301:
-	YYDEBUG(301, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'K') goto yy388;
-	if (yych == 'k') goto yy388;
-	goto yy40;
+		YYDEBUG(301, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy392;
+		if (yych == 'e') goto yy392;
+		goto yy47;
 yy302:
-	YYDEBUG(302, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy390;
-	if (yych == 'a') goto yy390;
-	goto yy40;
+		YYDEBUG(302, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy393;
+		if (yych == 't') goto yy393;
+		goto yy47;
 yy303:
-	YYDEBUG(303, yych);
-	yyaccept = 26;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(303, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy395;
+		if (yych == 'c') goto yy395;
+		goto yy47;
 yy304:
-	YYDEBUG(304, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_CASE);
-}
+		YYDEBUG(304, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy396;
+		if (yych == 'e') goto yy396;
+		goto yy47;
 yy305:
-	YYDEBUG(305, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'H') goto yy391;
-	if (yych == 'h') goto yy391;
-	goto yy40;
+		YYDEBUG(305, *YYCURSOR);
+		yyaccept = 21;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy306:
-	YYDEBUG(306, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy393;
-	if (yych == 's') goto yy393;
-	goto yy40;
+		YYDEBUG(306, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_NEW);
+}
 yy307:
-	YYDEBUG(307, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy395;
-	if (yych == 'e') goto yy395;
-	goto yy40;
+		YYDEBUG(307, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'V') {
+			if (yych == 'N') goto yy397;
+			if (yych <= 'U') goto yy47;
+			goto yy398;
+		} else {
+			if (yych <= 'n') {
+				if (yych <= 'm') goto yy47;
+				goto yy397;
+			} else {
+				if (yych == 'v') goto yy398;
+				goto yy47;
+			}
+		}
 yy308:
-	YYDEBUG(308, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy397;
-	if (yych == 't') goto yy397;
-	goto yy40;
+		YYDEBUG(308, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy399;
+		if (yych == 't') goto yy399;
+		goto yy47;
 yy309:
-	YYDEBUG(309, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy399;
-	if (yych == 'i') goto yy399;
-	goto yy40;
+		YYDEBUG(309, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy400;
+		if (yych == 'l') goto yy400;
+		goto yy47;
 yy310:
-	YYDEBUG(310, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy400;
-	if (yych == 'a') goto yy400;
-	goto yy40;
+		YYDEBUG(310, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy401;
+		if (yych == 'd') goto yy401;
+		goto yy47;
 yy311:
-	YYDEBUG(311, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'U') goto yy401;
-	if (yych == 'u') goto yy401;
-	goto yy40;
+		YYDEBUG(311, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'U') goto yy402;
+		if (yych == 'u') goto yy402;
+		goto yy47;
 yy312:
-	YYDEBUG(312, yych);
-	yyaccept = 27;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(312, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'U') goto yy403;
+		if (yych == 'u') goto yy403;
+		goto yy47;
 yy313:
-	YYDEBUG(313, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ECHO);
-}
+		YYDEBUG(313, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy404;
+		if (yych == 't') goto yy404;
+		goto yy47;
 yy314:
-	YYDEBUG(314, yych);
-	yyaccept = 28;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '\\') {
-		if (yych <= 'H') {
-			if (yych <= '/') goto yy315;
-			if (yych <= '9') goto yy39;
-			if (yych >= 'A') goto yy39;
-		} else {
-			if (yych <= 'I') goto yy402;
-			if (yych <= 'Z') goto yy39;
-			if (yych >= '\\') goto yy127;
-		}
-	} else {
-		if (yych <= 'h') {
-			if (yych == '_') goto yy39;
-			if (yych >= 'a') goto yy39;
-		} else {
-			if (yych <= 'i') goto yy402;
-			if (yych <= 'z') goto yy39;
-			if (yych >= 0x80) goto yy39;
-		}
-	}
+		YYDEBUG(314, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy405;
+		if (yych == 't') goto yy405;
+		goto yy47;
 yy315:
-	YYDEBUG(315, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ELSE);
-}
+		YYDEBUG(315, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy406;
+		if (yych == 'o') goto yy406;
+		goto yy47;
 yy316:
-	YYDEBUG(316, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'Y') goto yy403;
-	if (yych == 'y') goto yy403;
-	goto yy40;
+		YYDEBUG(316, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy407;
+		if (yych == 'i') goto yy407;
+		goto yy47;
 yy317:
-	YYDEBUG(317, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy405;
-	if (yych == 'e') goto yy405;
-	goto yy40;
+		YYDEBUG(317, *YYCURSOR);
+		yyaccept = 22;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy318:
-	YYDEBUG(318, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy406;
-	if (yych == 'o') goto yy406;
-	goto yy40;
+		YYDEBUG(318, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_TRY);
+}
 yy319:
-	YYDEBUG(319, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'F') goto yy407;
-	if (yych == 'f') goto yy407;
-	goto yy40;
+		YYDEBUG(319, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy408;
+		if (yych == 'e') goto yy408;
+		goto yy47;
 yy320:
-	YYDEBUG(320, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'W') goto yy409;
-	if (yych == 'w') goto yy409;
-	goto yy40;
+		YYDEBUG(320, *YYCURSOR);
+		yyaccept = 23;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy321:
-	YYDEBUG(321, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'H') goto yy410;
-	if (yych == 'h') goto yy410;
-	goto yy40;
+		YYDEBUG(321, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_USE);
+}
 yy322:
-	YYDEBUG(322, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '\f') {
-		if (yych <= 0x08) goto yy40;
-		if (yych <= '\n') goto yy411;
-		goto yy40;
-	} else {
-		if (yych <= '\r') goto yy411;
-		if (yych == ' ') goto yy411;
-		goto yy40;
-	}
+		YYDEBUG(322, *YYCURSOR);
+		yyaccept = 24;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy323:
-	YYDEBUG(323, yych);
-	yyaccept = 29;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy324:
-	YYDEBUG(324, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_EVAL);
+		YYDEBUG(323, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_VAR);
 }
+yy324:
+		YYDEBUG(324, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy409;
+		if (yych == 'l') goto yy409;
+		goto yy47;
 yy325:
-	YYDEBUG(325, yych);
-	yyaccept = 30;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(325, *YYCURSOR);
+		yyaccept = 25;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy326:
-	YYDEBUG(326, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_EXIT);
+		YYDEBUG(326, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_LOGICAL_XOR);
 }
 yy327:
-	YYDEBUG(327, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy412;
-	if (yych == 'n') goto yy412;
-	goto yy40;
+		YYDEBUG(327, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy410;
+		if (yych == 'l') goto yy410;
+		goto yy47;
 yy328:
-	YYDEBUG(328, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy413;
-	if (yych == 'l') goto yy413;
-	goto yy40;
+		YYDEBUG(328, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy85;
+			if (yych <= 'Z') goto yy207;
+			if (yych <= '^') goto yy85;
+			goto yy207;
+		} else {
+			if (yych <= '`') goto yy85;
+			if (yych <= 'z') goto yy207;
+			if (yych <= 0x7F) goto yy85;
+			goto yy207;
+		}
 yy329:
-	YYDEBUG(329, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy415;
-	if (yych == 'a') goto yy415;
-	goto yy40;
+		YYDEBUG(329, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy411;
+		if (yych == 'l') goto yy411;
+		goto yy47;
 yy330:
-	YYDEBUG(330, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy416;
-	if (yych == 't') goto yy416;
-	goto yy40;
+		YYDEBUG(330, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy412;
+		if (yych == 'i') goto yy412;
+		goto yy47;
 yy331:
-	YYDEBUG(331, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy417;
-	if (yych == 'a') goto yy417;
-	goto yy40;
+		YYDEBUG(331, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'U') {
+			if (yych == 'I') goto yy413;
+			if (yych <= 'T') goto yy47;
+			goto yy414;
+		} else {
+			if (yych <= 'i') {
+				if (yych <= 'h') goto yy47;
+				goto yy413;
+			} else {
+				if (yych == 'u') goto yy414;
+				goto yy47;
+			}
+		}
 yy332:
-	YYDEBUG(332, yych);
-	yyaccept = 31;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(332, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy415;
+		if (yych == 'a') goto yy415;
+		goto yy47;
 yy333:
-	YYDEBUG(333, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_GOTO);
-}
+		YYDEBUG(333, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy416;
+		if (yych == 'i') goto yy416;
+		goto yy47;
 yy334:
-	YYDEBUG(334, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy418;
-	if (yych == 'e') goto yy418;
-	goto yy40;
+		YYDEBUG(334, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy417;
+		if (yych == 'e') goto yy417;
+		goto yy47;
 yy335:
-	YYDEBUG(335, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'U') goto yy419;
-	if (yych == 'u') goto yy419;
-	goto yy40;
+		YYDEBUG(335, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy418;
+		if (yych == 'a') goto yy418;
+		goto yy47;
 yy336:
-	YYDEBUG(336, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'E') {
-		if (yych == 'A') goto yy420;
-		if (yych <= 'D') goto yy40;
-		goto yy421;
-	} else {
-		if (yych <= 'a') {
-			if (yych <= '`') goto yy40;
-			goto yy420;
-		} else {
-			if (yych == 'e') goto yy421;
-			goto yy40;
-		}
-	}
+		YYDEBUG(336, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy419;
+		if (yych == 'r') goto yy419;
+		goto yy47;
 yy337:
-	YYDEBUG(337, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy422;
-	if (yych == 'r') goto yy422;
-	goto yy40;
+		YYDEBUG(337, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'A') goto yy420;
+		if (yych == 'a') goto yy420;
+		goto yy85;
 yy338:
-	YYDEBUG(338, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy423;
-	if (yych == 't') goto yy423;
-	goto yy40;
+		YYDEBUG(338, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'A') goto yy421;
+		if (yych == 'a') goto yy421;
+		goto yy85;
 yy339:
-	YYDEBUG(339, yych);
-	yyaccept = 32;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(339, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'L') goto yy422;
+		if (yych == 'l') goto yy422;
+		goto yy85;
 yy340:
-	YYDEBUG(340, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_LIST);
-}
+		YYDEBUG(340, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'B') goto yy423;
+		if (yych == 'b') goto yy423;
+		goto yy85;
 yy341:
-	YYDEBUG(341, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'H') goto yy425;
-	if (yych == 'h') goto yy425;
-	goto yy40;
+		YYDEBUG(341, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'A') goto yy424;
+		if (yych == 'a') goto yy424;
+		goto yy85;
 yy342:
-	YYDEBUG(342, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy427;
-	if (yych == 's') goto yy427;
-	goto yy40;
+		YYDEBUG(342, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy429;
+		if (yych == 'e') goto yy429;
+		goto yy426;
 yy343:
-	YYDEBUG(343, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy428;
-	if (yych == 't') goto yy428;
-	goto yy40;
+		YYDEBUG(343, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy430;
+		if (yych == 'e') goto yy430;
+		goto yy85;
 yy344:
-	YYDEBUG(344, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy430;
-	if (yych == 'a') goto yy430;
-	goto yy40;
+		YYDEBUG(344, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'L') goto yy431;
+		if (yych == 'l') goto yy431;
+		goto yy85;
 yy345:
-	YYDEBUG(345, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy431;
-	if (yych == 'e') goto yy431;
-	goto yy40;
+		YYDEBUG(345, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'I') goto yy433;
+		if (yych == 'i') goto yy433;
+		goto yy85;
 yy346:
-	YYDEBUG(346, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy432;
-	if (yych == 'i') goto yy432;
-	goto yy40;
+		YYDEBUG(346, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy434;
+		if (yych == 'e') goto yy434;
+		goto yy85;
 yy347:
-	YYDEBUG(347, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy433;
-	if (yych == 'o') goto yy433;
-	goto yy40;
-yy348:
-	YYDEBUG(348, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy434;
-	if (yych == 'i') goto yy434;
-	goto yy40;
+		YYDEBUG(347, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(348, *YYCURSOR);
+		if (yych <= '\f') {
+			if (yych <= 0x08) goto yy125;
+			if (yych <= '\n') goto yy347;
+			goto yy125;
+		} else {
+			if (yych <= '\r') goto yy347;
+			if (yych == ' ') goto yy347;
+			goto yy125;
+		}
 yy349:
-	YYDEBUG(349, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy435;
-	if (yych == 'r') goto yy435;
-	goto yy40;
+		YYDEBUG(349, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '"') goto yy85;
+		if (yych <= '/') goto yy436;
+		if (yych <= '9') goto yy85;
+		goto yy436;
 yy350:
-	YYDEBUG(350, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy436;
-	if (yych == 'i') goto yy436;
-	goto yy40;
+		YYDEBUG(350, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\'') goto yy85;
+		if (yych <= '/') goto yy438;
+		if (yych <= '9') goto yy85;
+		goto yy438;
 yy351:
-	YYDEBUG(351, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy437;
-	if (yych == 'c') goto yy437;
-	goto yy40;
-yy352:
-	YYDEBUG(352, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'W') goto yy438;
-	if (yych == 'w') goto yy438;
-	goto yy40;
+		YYDEBUG(351, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(352, *YYCURSOR);
+		if (yych <= '@') {
+			if (yych <= '\f') {
+				if (yych == '\n') goto yy439;
+				goto yy85;
+			} else {
+				if (yych <= '\r') goto yy441;
+				if (yych <= '/') goto yy85;
+				if (yych <= '9') goto yy351;
+				goto yy85;
+			}
+		} else {
+			if (yych <= '_') {
+				if (yych <= 'Z') goto yy351;
+				if (yych <= '^') goto yy85;
+				goto yy351;
+			} else {
+				if (yych <= '`') goto yy85;
+				if (yych <= 'z') goto yy351;
+				if (yych <= 0x7F) goto yy85;
+				goto yy351;
+			}
+		}
 yy353:
-	YYDEBUG(353, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy440;
-	if (yych == 't') goto yy440;
-	goto yy40;
+		YYDEBUG(353, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy442;
+		if (yych == 'r') goto yy442;
+		goto yy47;
 yy354:
-	YYDEBUG(354, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy442;
-	if (yych == 't') goto yy442;
-	goto yy40;
+		YYDEBUG(354, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'Y') goto yy443;
+		if (yych == 'y') goto yy443;
+		goto yy47;
 yy355:
-	YYDEBUG(355, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy444;
-	if (yych == 'e') goto yy444;
-	goto yy40;
+		YYDEBUG(355, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'K') goto yy445;
+		if (yych == 'k') goto yy445;
+		goto yy47;
 yy356:
-	YYDEBUG(356, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy446;
-	if (yych == 'd') goto yy446;
-	goto yy40;
+		YYDEBUG(356, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy447;
+		if (yych == 'a') goto yy447;
+		goto yy47;
 yy357:
-	YYDEBUG(357, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy448;
-	if (yych == 'a') goto yy448;
-	goto yy40;
+		YYDEBUG(357, *YYCURSOR);
+		yyaccept = 26;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy358:
-	YYDEBUG(358, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy449;
-	if (yych == 'r') goto yy449;
-	goto yy40;
+		YYDEBUG(358, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_CASE);
+}
 yy359:
-	YYDEBUG(359, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy450;
-	if (yych == 'l') goto yy450;
-	goto yy40;
+		YYDEBUG(359, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'H') goto yy448;
+		if (yych == 'h') goto yy448;
+		goto yy47;
 yy360:
-	YYDEBUG(360, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy451;
-	if (yych == 'n') goto yy451;
-	goto yy40;
+		YYDEBUG(360, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy450;
+		if (yych == 's') goto yy450;
+		goto yy47;
 yy361:
-	YYDEBUG(361, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy452;
-	if (yych == 'l') goto yy452;
-	goto yy40;
+		YYDEBUG(361, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy452;
+		if (yych == 'e') goto yy452;
+		goto yy47;
 yy362:
-	YYDEBUG(362, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy453;
-	if (yych == 'n') goto yy453;
-	goto yy40;
+		YYDEBUG(362, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy454;
+		if (yych == 't') goto yy454;
+		goto yy47;
 yy363:
-	YYDEBUG(363, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy454;
-	if (yych == 't') goto yy454;
-	goto yy40;
+		YYDEBUG(363, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy456;
+		if (yych == 'i') goto yy456;
+		goto yy47;
 yy364:
-	YYDEBUG(364, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'M') goto yy455;
-	if (yych == 'm') goto yy455;
-	goto yy40;
+		YYDEBUG(364, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy457;
+		if (yych == 'a') goto yy457;
+		goto yy47;
 yy365:
-	YYDEBUG(365, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy456;
-	if (yych == 'a') goto yy456;
-	goto yy40;
+		YYDEBUG(365, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'U') goto yy458;
+		if (yych == 'u') goto yy458;
+		goto yy47;
 yy366:
-	YYDEBUG(366, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy457;
-	if (yych == 'y') goto yy457;
-	goto yy71;
+		YYDEBUG(366, *YYCURSOR);
+		yyaccept = 27;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy367:
-	YYDEBUG(367, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy458;
-	if (yych == 'r') goto yy458;
-	goto yy71;
+		YYDEBUG(367, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ECHO);
+}
 yy368:
-	YYDEBUG(368, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy461;
-	if (yych == 'e') goto yy461;
-	goto yy460;
+		YYDEBUG(368, *YYCURSOR);
+		yyaccept = 28;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\\') {
+			if (yych <= 'H') {
+				if (yych <= '/') goto yy369;
+				if (yych <= '9') goto yy46;
+				if (yych >= 'A') goto yy46;
+			} else {
+				if (yych <= 'I') goto yy459;
+				if (yych <= 'Z') goto yy46;
+				if (yych >= '\\') goto yy160;
+			}
+		} else {
+			if (yych <= 'h') {
+				if (yych == '_') goto yy46;
+				if (yych >= 'a') goto yy46;
+			} else {
+				if (yych <= 'i') goto yy459;
+				if (yych <= 'z') goto yy46;
+				if (yych >= 0x80) goto yy46;
+			}
+		}
 yy369:
-	YYDEBUG(369, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy462;
-	if (yych == 'l') goto yy462;
-	goto yy71;
+		YYDEBUG(369, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ELSE);
+}
 yy370:
-	YYDEBUG(370, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy463;
-	if (yych == 't') goto yy463;
-	goto yy71;
+		YYDEBUG(370, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'Y') goto yy460;
+		if (yych == 'y') goto yy460;
+		goto yy47;
 yy371:
-	YYDEBUG(371, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
+		YYDEBUG(371, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy462;
+		if (yych == 'e') goto yy462;
+		goto yy47;
 yy372:
-	YYDEBUG(372, yych);
-	if (yych <= 0x1F) {
-		if (yych == '\t') goto yy371;
-		goto yy71;
-	} else {
-		if (yych <= ' ') goto yy371;
-		if (yych != ')') goto yy71;
-	}
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN(T_INT_CAST);
-}
+		YYDEBUG(372, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy463;
+		if (yych == 'o') goto yy463;
+		goto yy47;
 yy373:
-	YYDEBUG(373, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'G') goto yy464;
-	if (yych == 'g') goto yy464;
-	goto yy71;
+		YYDEBUG(373, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'F') goto yy464;
+		if (yych == 'f') goto yy464;
+		goto yy47;
 yy374:
-	YYDEBUG(374, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'C') goto yy465;
-	if (yych == 'c') goto yy465;
-	goto yy71;
+		YYDEBUG(374, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'W') goto yy466;
+		if (yych == 'w') goto yy466;
+		goto yy47;
 yy375:
-	YYDEBUG(375, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= 0x1F) {
-		if (yych == '\t') goto yy375;
-		goto yy71;
-	} else {
-		if (yych <= ' ') goto yy375;
-		if (yych == ')') goto yy466;
-		goto yy71;
-	}
+		YYDEBUG(375, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'H') goto yy467;
+		if (yych == 'h') goto yy467;
+		goto yy47;
 yy376:
-	YYDEBUG(376, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy467;
-	if (yych == 'n') goto yy467;
-	goto yy71;
+		YYDEBUG(376, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\f') {
+			if (yych <= 0x08) goto yy47;
+			if (yych <= '\n') goto yy468;
+			goto yy47;
+		} else {
+			if (yych <= '\r') goto yy468;
+			if (yych == ' ') goto yy468;
+			goto yy47;
+		}
 yy377:
-	YYDEBUG(377, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy468;
-	if (yych == 't') goto yy468;
-	goto yy71;
+		YYDEBUG(377, *YYCURSOR);
+		yyaccept = 29;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy378:
-	YYDEBUG(378, yych);
-	++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
+		YYDEBUG(378, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_EVAL);
+}
 yy379:
-	YYDEBUG(379, yych);
-	if (yych <= 'Z') {
-		if (yych <= '/') {
-			if (yych == '"') goto yy469;
-			goto yy71;
-		} else {
-			if (yych <= '9') goto yy378;
-			if (yych <= '@') goto yy71;
-			goto yy378;
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych == '_') goto yy378;
-			goto yy71;
-		} else {
-			if (yych <= 'z') goto yy378;
-			if (yych <= 0x7F) goto yy71;
-			goto yy378;
+		YYDEBUG(379, *YYCURSOR);
+		yyaccept = 30;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
 		}
-	}
+		if (yych == '\\') goto yy160;
 yy380:
-	YYDEBUG(380, yych);
-	++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
+		YYDEBUG(380, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_EXIT);
+}
 yy381:
-	YYDEBUG(381, yych);
-	if (yych <= 'Z') {
-		if (yych <= '/') {
-			if (yych == '\'') goto yy469;
-			goto yy71;
+		YYDEBUG(381, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy470;
+		if (yych == 'n') goto yy470;
+		goto yy47;
+yy382:
+		YYDEBUG(382, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy471;
+		if (yych == 'l') goto yy471;
+		goto yy47;
+yy383:
+		YYDEBUG(383, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy473;
+		if (yych == 'a') goto yy473;
+		goto yy47;
+yy384:
+		YYDEBUG(384, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy474;
+		if (yych == 't') goto yy474;
+		goto yy47;
+yy385:
+		YYDEBUG(385, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy475;
+		if (yych == 'a') goto yy475;
+		goto yy47;
+yy386:
+		YYDEBUG(386, *YYCURSOR);
+		yyaccept = 31;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy387:
+		YYDEBUG(387, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_GOTO);
+}
+yy388:
+		YYDEBUG(388, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy476;
+		if (yych == 'e') goto yy476;
+		goto yy47;
+yy389:
+		YYDEBUG(389, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'U') goto yy477;
+		if (yych == 'u') goto yy477;
+		goto yy47;
+yy390:
+		YYDEBUG(390, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'E') {
+			if (yych == 'A') goto yy478;
+			if (yych <= 'D') goto yy47;
+			goto yy479;
+		} else {
+			if (yych <= 'a') {
+				if (yych <= '`') goto yy47;
+				goto yy478;
+			} else {
+				if (yych == 'e') goto yy479;
+				goto yy47;
+			}
+		}
+yy391:
+		YYDEBUG(391, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy480;
+		if (yych == 'r') goto yy480;
+		goto yy47;
+yy392:
+		YYDEBUG(392, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy481;
+		if (yych == 't') goto yy481;
+		goto yy47;
+yy393:
+		YYDEBUG(393, *YYCURSOR);
+		yyaccept = 32;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy394:
+		YYDEBUG(394, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_LIST);
+}
+yy395:
+		YYDEBUG(395, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'H') goto yy483;
+		if (yych == 'h') goto yy483;
+		goto yy47;
+yy396:
+		YYDEBUG(396, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy485;
+		if (yych == 's') goto yy485;
+		goto yy47;
+yy397:
+		YYDEBUG(397, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy486;
+		if (yych == 't') goto yy486;
+		goto yy47;
+yy398:
+		YYDEBUG(398, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy488;
+		if (yych == 'a') goto yy488;
+		goto yy47;
+yy399:
+		YYDEBUG(399, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy489;
+		if (yych == 'e') goto yy489;
+		goto yy47;
+yy400:
+		YYDEBUG(400, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy490;
+		if (yych == 'i') goto yy490;
+		goto yy47;
+yy401:
+		YYDEBUG(401, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy491;
+		if (yych == 'o') goto yy491;
+		goto yy47;
+yy402:
+		YYDEBUG(402, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy492;
+		if (yych == 'i') goto yy492;
+		goto yy47;
+yy403:
+		YYDEBUG(403, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy493;
+		if (yych == 'r') goto yy493;
+		goto yy47;
+yy404:
+		YYDEBUG(404, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy494;
+		if (yych == 'i') goto yy494;
+		goto yy47;
+yy405:
+		YYDEBUG(405, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy495;
+		if (yych == 'c') goto yy495;
+		goto yy47;
+yy406:
+		YYDEBUG(406, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'W') goto yy496;
+		if (yych == 'w') goto yy496;
+		goto yy47;
+yy407:
+		YYDEBUG(407, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy498;
+		if (yych == 't') goto yy498;
+		goto yy47;
+yy408:
+		YYDEBUG(408, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy500;
+		if (yych == 't') goto yy500;
+		goto yy47;
+yy409:
+		YYDEBUG(409, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy502;
+		if (yych == 'e') goto yy502;
+		goto yy47;
+yy410:
+		YYDEBUG(410, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy504;
+		if (yych == 'd') goto yy504;
+		goto yy47;
+yy411:
+		YYDEBUG(411, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy506;
+		if (yych == 'a') goto yy506;
+		goto yy47;
+yy412:
+		YYDEBUG(412, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy507;
+		if (yych == 'r') goto yy507;
+		goto yy47;
+yy413:
+		YYDEBUG(413, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy508;
+		if (yych == 'l') goto yy508;
+		goto yy47;
+yy414:
+		YYDEBUG(414, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy509;
+		if (yych == 'n') goto yy509;
+		goto yy47;
+yy415:
+		YYDEBUG(415, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy510;
+		if (yych == 'l') goto yy510;
+		goto yy47;
+yy416:
+		YYDEBUG(416, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy511;
+		if (yych == 'n') goto yy511;
+		goto yy47;
+yy417:
+		YYDEBUG(417, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy512;
+		if (yych == 't') goto yy512;
+		goto yy47;
+yy418:
+		YYDEBUG(418, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'M') goto yy513;
+		if (yych == 'm') goto yy513;
+		goto yy47;
+yy419:
+		YYDEBUG(419, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy514;
+		if (yych == 'a') goto yy514;
+		goto yy47;
+yy420:
+		YYDEBUG(420, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'Y') goto yy515;
+		if (yych == 'y') goto yy515;
+		goto yy85;
+yy421:
+		YYDEBUG(421, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'R') goto yy517;
+		if (yych == 'r') goto yy517;
+		goto yy85;
+yy422:
+		YYDEBUG(422, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy522;
+		if (yych == 'e') goto yy522;
+		goto yy519;
+yy423:
+		YYDEBUG(423, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'L') goto yy523;
+		if (yych == 'l') goto yy523;
+		goto yy85;
+yy424:
+		YYDEBUG(424, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'T') goto yy524;
+		if (yych == 't') goto yy524;
+		goto yy85;
+yy425:
+		YYDEBUG(425, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+yy426:
+		YYDEBUG(426, *YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych == '\t') goto yy425;
+			goto yy85;
 		} else {
-			if (yych <= '9') goto yy380;
-			if (yych <= '@') goto yy71;
-			goto yy380;
+			if (yych <= ' ') goto yy425;
+			if (yych != ')') goto yy85;
 		}
-	} else {
-		if (yych <= '`') {
-			if (yych == '_') goto yy380;
-			goto yy71;
-		} else {
-			if (yych <= 'z') goto yy380;
-			if (yych <= 0x7F) goto yy71;
-			goto yy380;
+		YYDEBUG(427, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(428, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN(T_INT_CAST);
+}
+yy429:
+		YYDEBUG(429, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'G') goto yy526;
+		if (yych == 'g') goto yy526;
+		goto yy85;
+yy430:
+		YYDEBUG(430, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'C') goto yy527;
+		if (yych == 'c') goto yy527;
+		goto yy85;
+yy431:
+		YYDEBUG(431, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(432, *YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych == '\t') goto yy431;
+			goto yy85;
+		} else {
+			if (yych <= ' ') goto yy431;
+			if (yych == ')') goto yy528;
+			goto yy85;
 		}
-	}
-yy382:
-	YYDEBUG(382, yych);
-	++YYCURSOR;
-yy383:
-	YYDEBUG(383, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy433:
+		YYDEBUG(433, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'N') goto yy530;
+		if (yych == 'n') goto yy530;
+		goto yy85;
+yy434:
+		YYDEBUG(434, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'T') goto yy531;
+		if (yych == 't') goto yy531;
+		goto yy85;
+yy435:
+		YYDEBUG(435, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
+yy436:
+		YYDEBUG(436, *YYCURSOR);
+		if (yych <= 'Z') {
+			if (yych <= '/') {
+				if (yych == '"') goto yy533;
+				goto yy85;
+			} else {
+				if (yych <= '9') goto yy435;
+				if (yych <= '@') goto yy85;
+				goto yy435;
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych == '_') goto yy435;
+				goto yy85;
+			} else {
+				if (yych <= 'z') goto yy435;
+				if (yych <= 0x7F) goto yy85;
+				goto yy435;
+			}
+		}
+yy437:
+		YYDEBUG(437, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
+yy438:
+		YYDEBUG(438, *YYCURSOR);
+		if (yych <= 'Z') {
+			if (yych <= '/') {
+				if (yych == '\'') goto yy533;
+				goto yy85;
+			} else {
+				if (yych <= '9') goto yy437;
+				if (yych <= '@') goto yy85;
+				goto yy437;
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych == '_') goto yy437;
+				goto yy85;
+			} else {
+				if (yych <= 'z') goto yy437;
+				if (yych <= 0x7F) goto yy85;
+				goto yy437;
+			}
+		}
+yy439:
+		YYDEBUG(439, *YYCURSOR);
+		++YYCURSOR;
+yy440:
+		YYDEBUG(440, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	char *s;
 	unsigned char *saved_cursor;
 	int bprefix = (yytext[0] != '<') ? 1 : 0, spacing = 0, indentation = 0;
@@ -5831,2187 +5818,2356 @@
 
 	RETURN_TOKEN(T_START_HEREDOC);
 }
-yy384:
-	YYDEBUG(384, yych);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy382;
-	goto yy383;
-yy385:
-	YYDEBUG(385, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy470;
-	if (yych == 'a') goto yy470;
-	goto yy40;
-yy386:
-	YYDEBUG(386, yych);
-	yyaccept = 33;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy387:
-	YYDEBUG(387, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ARRAY);
-}
-yy388:
-	YYDEBUG(388, yych);
-	yyaccept = 34;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy389:
-	YYDEBUG(389, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_BREAK);
-}
-yy390:
-	YYDEBUG(390, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'B') goto yy471;
-	if (yych == 'b') goto yy471;
-	goto yy40;
-yy391:
-	YYDEBUG(391, yych);
-	yyaccept = 35;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy392:
-	YYDEBUG(392, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_CATCH);
-}
-yy393:
-	YYDEBUG(393, yych);
-	yyaccept = 36;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy394:
-	YYDEBUG(394, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_CLASS);
-}
-yy395:
-	YYDEBUG(395, yych);
-	yyaccept = 37;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy396:
-	YYDEBUG(396, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_CLONE);
-}
-yy397:
-	YYDEBUG(397, yych);
-	yyaccept = 38;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy398:
-	YYDEBUG(398, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_CONST);
-}
-yy399:
-	YYDEBUG(399, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy472;
-	if (yych == 'n') goto yy472;
-	goto yy40;
-yy400:
-	YYDEBUG(400, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy473;
-	if (yych == 'r') goto yy473;
-	goto yy40;
-yy401:
-	YYDEBUG(401, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy474;
-	if (yych == 'l') goto yy474;
-	goto yy40;
-yy402:
-	YYDEBUG(402, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'F') goto yy475;
-	if (yych == 'f') goto yy475;
-	goto yy40;
-yy403:
-	YYDEBUG(403, yych);
-	yyaccept = 39;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy404:
-	YYDEBUG(404, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_EMPTY);
-}
-yy405:
-	YYDEBUG(405, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy477;
-	if (yych == 'c') goto yy477;
-	goto yy40;
-yy406:
-	YYDEBUG(406, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy478;
-	if (yych == 'r') goto yy478;
-	goto yy40;
-yy407:
-	YYDEBUG(407, yych);
-	yyaccept = 40;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy408:
-	YYDEBUG(408, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ENDIF);
-}
-yy409:
-	YYDEBUG(409, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy480;
-	if (yych == 'i') goto yy480;
-	goto yy40;
-yy410:
-	YYDEBUG(410, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy481;
-	if (yych == 'i') goto yy481;
-	goto yy40;
-yy411:
-	YYDEBUG(411, yych);
-	++YYCURSOR;
-	YYFILL(10);
-	yych = *YYCURSOR;
-	if (yych <= 'I') {
-		if (yych <= 0x1F) {
-			if (yych <= '\n') {
-				if (yych <= 0x08) goto yy71;
-				goto yy411;
-			} else {
-				if (yych == '\r') goto yy411;
-				goto yy71;
-			}
-		} else {
-			if (yych <= 'D') {
-				if (yych <= ' ') goto yy411;
-				if (yych <= '@') goto yy71;
-				goto yy482;
-			} else {
-				if (yych <= 'E') goto yy484;
-				if (yych <= 'H') goto yy482;
-				goto yy485;
-			}
-		}
-	} else {
-		if (yych <= 'd') {
-			if (yych <= '^') {
-				if (yych <= 'Z') goto yy482;
-				goto yy71;
-			} else {
-				if (yych == '`') goto yy71;
-				goto yy482;
-			}
-		} else {
-			if (yych <= 'i') {
-				if (yych <= 'e') goto yy484;
-				if (yych <= 'h') goto yy482;
-				goto yy485;
-			} else {
-				if (yych <= 'z') goto yy482;
-				if (yych <= 0x7F) goto yy71;
-				goto yy482;
-			}
-		}
-	}
-yy412:
-	YYDEBUG(412, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy486;
-	if (yych == 'd') goto yy486;
-	goto yy40;
-yy413:
-	YYDEBUG(413, yych);
-	yyaccept = 41;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '\\') {
-		if (yych <= 'K') {
-			if (yych <= '/') goto yy414;
-			if (yych <= '9') goto yy39;
-			if (yych >= 'A') goto yy39;
-		} else {
-			if (yych <= 'L') goto yy487;
-			if (yych <= 'Z') goto yy39;
-			if (yych >= '\\') goto yy127;
-		}
-	} else {
-		if (yych <= 'k') {
-			if (yych == '_') goto yy39;
-			if (yych >= 'a') goto yy39;
-		} else {
-			if (yych <= 'l') goto yy487;
-			if (yych <= 'z') goto yy39;
-			if (yych >= 0x80) goto yy39;
-		}
-	}
-yy414:
-	YYDEBUG(414, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_FINAL);
-}
-yy415:
-	YYDEBUG(415, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy488;
-	if (yych == 'c') goto yy488;
-	goto yy40;
-yy416:
-	YYDEBUG(416, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy489;
-	if (yych == 'i') goto yy489;
-	goto yy40;
-yy417:
-	YYDEBUG(417, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy490;
-	if (yych == 'l') goto yy490;
-	goto yy40;
-yy418:
-	YYDEBUG(418, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'M') goto yy492;
-	if (yych == 'm') goto yy492;
-	goto yy40;
-yy419:
-	YYDEBUG(419, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy493;
-	if (yych == 'd') goto yy493;
-	goto yy40;
-yy420:
-	YYDEBUG(420, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy494;
-	if (yych == 'n') goto yy494;
-	goto yy40;
-yy421:
-	YYDEBUG(421, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy495;
-	if (yych == 'a') goto yy495;
-	goto yy40;
-yy422:
-	YYDEBUG(422, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'F') goto yy496;
-	if (yych == 'f') goto yy496;
-	goto yy40;
-yy423:
-	YYDEBUG(423, yych);
-	yyaccept = 42;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy424:
-	YYDEBUG(424, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ISSET);
-}
-yy425:
-	YYDEBUG(425, yych);
-	yyaccept = 43;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy426:
-	YYDEBUG(426, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_MATCH);
-}
-yy427:
-	YYDEBUG(427, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'P') goto yy497;
-	if (yych == 'p') goto yy497;
-	goto yy40;
-yy428:
-	YYDEBUG(428, yych);
-	yyaccept = 44;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy429:
-	YYDEBUG(429, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_PRINT);
-}
-yy430:
-	YYDEBUG(430, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy498;
-	if (yych == 't') goto yy498;
-	goto yy40;
-yy431:
-	YYDEBUG(431, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy499;
-	if (yych == 'c') goto yy499;
-	goto yy40;
-yy432:
-	YYDEBUG(432, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy500;
-	if (yych == 'c') goto yy500;
-	goto yy40;
-yy433:
-	YYDEBUG(433, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy502;
-	if (yych == 'n') goto yy502;
-	goto yy40;
-yy434:
-	YYDEBUG(434, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy503;
-	if (yych == 'r') goto yy503;
-	goto yy40;
-yy435:
-	YYDEBUG(435, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy504;
-	if (yych == 'n') goto yy504;
-	goto yy40;
-yy436:
-	YYDEBUG(436, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy506;
-	if (yych == 'c') goto yy506;
-	goto yy40;
-yy437:
-	YYDEBUG(437, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'H') goto yy508;
-	if (yych == 'h') goto yy508;
-	goto yy40;
-yy438:
-	YYDEBUG(438, yych);
-	yyaccept = 45;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy439:
-	YYDEBUG(439, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_THROW);
-}
-yy440:
-	YYDEBUG(440, yych);
-	yyaccept = 46;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
 yy441:
-	YYDEBUG(441, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_TRAIT);
-}
+		YYDEBUG(441, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy439;
+		goto yy440;
 yy442:
-	YYDEBUG(442, yych);
-	yyaccept = 47;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(442, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy534;
+		if (yych == 'a') goto yy534;
+		goto yy47;
 yy443:
-	YYDEBUG(443, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_UNSET);
-}
+		YYDEBUG(443, *YYCURSOR);
+		yyaccept = 33;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy444:
-	YYDEBUG(444, yych);
-	yyaccept = 48;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy445:
-	YYDEBUG(445, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_WHILE);
+		YYDEBUG(444, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ARRAY);
 }
-yy446:
-	YYDEBUG(446, yych);
-	yyaccept = 49;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych <= '\r') {
-		if (yych <= 0x08) goto yy447;
-		if (yych <= '\n') goto yy510;
-		if (yych >= '\r') goto yy510;
-	} else {
-		if (yych <= ' ') {
-			if (yych >= ' ') goto yy510;
-		} else {
-			if (yych == '\\') goto yy127;
+yy445:
+		YYDEBUG(445, *YYCURSOR);
+		yyaccept = 34;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
 		}
-	}
-yy447:
-	YYDEBUG(447, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_YIELD);
+		if (yych == '\\') goto yy160;
+yy446:
+		YYDEBUG(446, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_BREAK);
 }
+yy447:
+		YYDEBUG(447, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'B') goto yy535;
+		if (yych == 'b') goto yy535;
+		goto yy47;
 yy448:
-	YYDEBUG(448, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy511;
-	if (yych == 's') goto yy511;
-	goto yy40;
+		YYDEBUG(448, *YYCURSOR);
+		yyaccept = 35;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy449:
-	YYDEBUG(449, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy512;
-	goto yy40;
+		YYDEBUG(449, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_CATCH);
+}
 yy450:
-	YYDEBUG(450, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy513;
-	if (yych == 'e') goto yy513;
-	goto yy40;
+		YYDEBUG(450, *YYCURSOR);
+		yyaccept = 36;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy451:
-	YYDEBUG(451, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy514;
-	if (yych == 'c') goto yy514;
-	goto yy40;
+		YYDEBUG(451, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_CLASS);
+}
 yy452:
-	YYDEBUG(452, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy515;
-	if (yych == 't') goto yy515;
-	goto yy40;
+		YYDEBUG(452, *YYCURSOR);
+		yyaccept = 37;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy453:
-	YYDEBUG(453, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy516;
-	if (yych == 'e') goto yy516;
-	goto yy40;
+		YYDEBUG(453, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_CLONE);
+}
 yy454:
-	YYDEBUG(454, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'H') goto yy517;
-	if (yych == 'h') goto yy517;
-	goto yy40;
+		YYDEBUG(454, *YYCURSOR);
+		yyaccept = 38;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy455:
-	YYDEBUG(455, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy518;
-	if (yych == 'e') goto yy518;
-	goto yy40;
+		YYDEBUG(455, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_CONST);
+}
 yy456:
-	YYDEBUG(456, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy519;
-	if (yych == 'i') goto yy519;
-	goto yy40;
+		YYDEBUG(456, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy536;
+		if (yych == 'n') goto yy536;
+		goto yy47;
 yy457:
-	YYDEBUG(457, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= 0x1F) {
-		if (yych == '\t') goto yy457;
-		goto yy71;
-	} else {
-		if (yych <= ' ') goto yy457;
-		if (yych == ')') goto yy520;
-		goto yy71;
-	}
+		YYDEBUG(457, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy537;
+		if (yych == 'r') goto yy537;
+		goto yy47;
 yy458:
-	YYDEBUG(458, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'Y') goto yy521;
-	if (yych == 'y') goto yy521;
-	goto yy71;
+		YYDEBUG(458, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy538;
+		if (yych == 'l') goto yy538;
+		goto yy47;
 yy459:
-	YYDEBUG(459, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
+		YYDEBUG(459, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'F') goto yy539;
+		if (yych == 'f') goto yy539;
+		goto yy47;
 yy460:
-	YYDEBUG(460, yych);
-	if (yych <= 0x1F) {
-		if (yych == '\t') goto yy459;
-		goto yy71;
-	} else {
-		if (yych <= ' ') goto yy459;
-		if (yych != ')') goto yy71;
-	}
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN(T_BOOL_CAST);
-}
+		YYDEBUG(460, *YYCURSOR);
+		yyaccept = 39;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy461:
-	YYDEBUG(461, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy522;
-	if (yych == 'a') goto yy522;
-	goto yy71;
+		YYDEBUG(461, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_EMPTY);
+}
 yy462:
-	YYDEBUG(462, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy463;
-	if (yych != 'e') goto yy71;
+		YYDEBUG(462, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy541;
+		if (yych == 'c') goto yy541;
+		goto yy47;
 yy463:
-	YYDEBUG(463, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= 0x1F) {
-		if (yych == '\t') goto yy463;
-		goto yy71;
-	} else {
-		if (yych <= ' ') goto yy463;
-		if (yych == ')') goto yy523;
-		goto yy71;
-	}
+		YYDEBUG(463, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy542;
+		if (yych == 'r') goto yy542;
+		goto yy47;
 yy464:
-	YYDEBUG(464, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy524;
-	if (yych == 'e') goto yy524;
-	goto yy71;
+		YYDEBUG(464, *YYCURSOR);
+		yyaccept = 40;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy465:
-	YYDEBUG(465, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy525;
-	if (yych == 't') goto yy525;
-	goto yy71;
-yy466:
-	YYDEBUG(466, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	if (PARSER_MODE()) {
-		zend_throw_exception(zend_ce_parse_error, "The (real) cast has been removed, use (float) instead", 0);
-		RETURN_TOKEN(T_ERROR);
-	}
-	RETURN_TOKEN(T_DOUBLE_CAST);
+		YYDEBUG(465, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ENDIF);
 }
+yy466:
+		YYDEBUG(466, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy544;
+		if (yych == 'i') goto yy544;
+		goto yy47;
 yy467:
-	YYDEBUG(467, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'G') goto yy521;
-	if (yych == 'g') goto yy521;
-	goto yy71;
+		YYDEBUG(467, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy545;
+		if (yych == 'i') goto yy545;
+		goto yy47;
 yy468:
-	YYDEBUG(468, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= 0x1F) {
-		if (yych == '\t') goto yy468;
-		goto yy71;
-	} else {
-		if (yych <= ' ') goto yy468;
-		if (yych == ')') goto yy526;
-		goto yy71;
-	}
-yy469:
-	YYDEBUG(469, yych);
-	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy382;
-	if (yych == '\r') goto yy384;
-	goto yy71;
+		YYDEBUG(468, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(10);
+		yych = *YYCURSOR;
+		YYDEBUG(469, *YYCURSOR);
+		if (yych <= 'I') {
+			if (yych <= 0x1F) {
+				if (yych <= '\n') {
+					if (yych <= 0x08) goto yy85;
+					goto yy468;
+				} else {
+					if (yych == '\r') goto yy468;
+					goto yy85;
+				}
+			} else {
+				if (yych <= 'D') {
+					if (yych <= ' ') goto yy468;
+					if (yych <= '@') goto yy85;
+					goto yy546;
+				} else {
+					if (yych <= 'E') goto yy548;
+					if (yych <= 'H') goto yy546;
+					goto yy549;
+				}
+			}
+		} else {
+			if (yych <= 'd') {
+				if (yych <= '^') {
+					if (yych <= 'Z') goto yy546;
+					goto yy85;
+				} else {
+					if (yych == '`') goto yy85;
+					goto yy546;
+				}
+			} else {
+				if (yych <= 'i') {
+					if (yych <= 'e') goto yy548;
+					if (yych <= 'h') goto yy546;
+					goto yy549;
+				} else {
+					if (yych <= 'z') goto yy546;
+					if (yych <= 0x7F) goto yy85;
+					goto yy546;
+				}
+			}
+		}
 yy470:
-	YYDEBUG(470, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy527;
-	if (yych == 'c') goto yy527;
-	goto yy40;
+		YYDEBUG(470, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy550;
+		if (yych == 'd') goto yy550;
+		goto yy47;
 yy471:
-	YYDEBUG(471, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy528;
-	if (yych == 'l') goto yy528;
-	goto yy40;
+		YYDEBUG(471, *YYCURSOR);
+		yyaccept = 41;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\\') {
+			if (yych <= 'K') {
+				if (yych <= '/') goto yy472;
+				if (yych <= '9') goto yy46;
+				if (yych >= 'A') goto yy46;
+			} else {
+				if (yych <= 'L') goto yy551;
+				if (yych <= 'Z') goto yy46;
+				if (yych >= '\\') goto yy160;
+			}
+		} else {
+			if (yych <= 'k') {
+				if (yych == '_') goto yy46;
+				if (yych >= 'a') goto yy46;
+			} else {
+				if (yych <= 'l') goto yy551;
+				if (yych <= 'z') goto yy46;
+				if (yych >= 0x80) goto yy46;
+			}
+		}
 yy472:
-	YYDEBUG(472, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'U') goto yy529;
-	if (yych == 'u') goto yy529;
-	goto yy40;
+		YYDEBUG(472, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_FINAL);
+}
 yy473:
-	YYDEBUG(473, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy530;
-	if (yych == 'e') goto yy530;
-	goto yy40;
+		YYDEBUG(473, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy552;
+		if (yych == 'c') goto yy552;
+		goto yy47;
 yy474:
-	YYDEBUG(474, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy532;
-	if (yych == 't') goto yy532;
-	goto yy40;
+		YYDEBUG(474, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy553;
+		if (yych == 'i') goto yy553;
+		goto yy47;
 yy475:
-	YYDEBUG(475, yych);
-	yyaccept = 50;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(475, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy554;
+		if (yych == 'l') goto yy554;
+		goto yy47;
 yy476:
-	YYDEBUG(476, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ELSEIF);
-}
+		YYDEBUG(476, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'M') goto yy556;
+		if (yych == 'm') goto yy556;
+		goto yy47;
 yy477:
-	YYDEBUG(477, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy534;
-	if (yych == 'l') goto yy534;
-	goto yy40;
+		YYDEBUG(477, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy557;
+		if (yych == 'd') goto yy557;
+		goto yy47;
 yy478:
-	YYDEBUG(478, yych);
-	yyaccept = 51;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '\\') {
-		if (yych <= 'D') {
-			if (yych <= '/') goto yy479;
-			if (yych <= '9') goto yy39;
-			if (yych >= 'A') goto yy39;
-		} else {
-			if (yych <= 'E') goto yy535;
-			if (yych <= 'Z') goto yy39;
-			if (yych >= '\\') goto yy127;
-		}
-	} else {
-		if (yych <= 'd') {
-			if (yych == '_') goto yy39;
-			if (yych >= 'a') goto yy39;
-		} else {
-			if (yych <= 'e') goto yy535;
-			if (yych <= 'z') goto yy39;
-			if (yych >= 0x80) goto yy39;
-		}
-	}
+		YYDEBUG(478, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy558;
+		if (yych == 'n') goto yy558;
+		goto yy47;
 yy479:
-	YYDEBUG(479, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ENDFOR);
-}
+		YYDEBUG(479, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy559;
+		if (yych == 'a') goto yy559;
+		goto yy47;
 yy480:
-	YYDEBUG(480, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy536;
-	if (yych == 't') goto yy536;
-	goto yy40;
+		YYDEBUG(480, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'F') goto yy560;
+		if (yych == 'f') goto yy560;
+		goto yy47;
 yy481:
-	YYDEBUG(481, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy537;
-	if (yych == 'l') goto yy537;
-	goto yy40;
+		YYDEBUG(481, *YYCURSOR);
+		yyaccept = 42;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy482:
-	YYDEBUG(482, yych);
-	++YYCURSOR;
-yy483:
-	YYDEBUG(483, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	yyless(4);
-	RETURN_TOKEN_WITH_IDENT(T_ENUM);
+		YYDEBUG(482, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ISSET);
 }
+yy483:
+		YYDEBUG(483, *YYCURSOR);
+		yyaccept = 43;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy484:
-	YYDEBUG(484, yych);
-	yyaccept = 52;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'X') goto yy538;
-	if (yych == 'x') goto yy538;
-	goto yy483;
+		YYDEBUG(484, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_MATCH);
+}
 yy485:
-	YYDEBUG(485, yych);
-	yyaccept = 52;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'M') goto yy539;
-	if (yych == 'm') goto yy539;
-	goto yy483;
+		YYDEBUG(485, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'P') goto yy561;
+		if (yych == 'p') goto yy561;
+		goto yy47;
 yy486:
-	YYDEBUG(486, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy540;
-	if (yych == 's') goto yy540;
-	goto yy40;
+		YYDEBUG(486, *YYCURSOR);
+		yyaccept = 44;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy487:
-	YYDEBUG(487, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'Y') goto yy542;
-	if (yych == 'y') goto yy542;
-	goto yy40;
+		YYDEBUG(487, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_PRINT);
+}
 yy488:
-	YYDEBUG(488, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'H') goto yy544;
-	if (yych == 'h') goto yy544;
-	goto yy40;
+		YYDEBUG(488, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy562;
+		if (yych == 't') goto yy562;
+		goto yy47;
 yy489:
-	YYDEBUG(489, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy546;
-	if (yych == 'o') goto yy546;
-	goto yy40;
+		YYDEBUG(489, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy563;
+		if (yych == 'c') goto yy563;
+		goto yy47;
 yy490:
-	YYDEBUG(490, yych);
-	yyaccept = 53;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(490, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy564;
+		if (yych == 'c') goto yy564;
+		goto yy47;
 yy491:
-	YYDEBUG(491, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_GLOBAL);
-}
+		YYDEBUG(491, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy566;
+		if (yych == 'n') goto yy566;
+		goto yy47;
 yy492:
-	YYDEBUG(492, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy547;
-	if (yych == 'e') goto yy547;
-	goto yy40;
+		YYDEBUG(492, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy567;
+		if (yych == 'r') goto yy567;
+		goto yy47;
 yy493:
-	YYDEBUG(493, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy548;
-	if (yych == 'e') goto yy548;
-	goto yy40;
+		YYDEBUG(493, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy568;
+		if (yych == 'n') goto yy568;
+		goto yy47;
 yy494:
-	YYDEBUG(494, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy550;
-	if (yych == 'c') goto yy550;
-	goto yy40;
+		YYDEBUG(494, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy570;
+		if (yych == 'c') goto yy570;
+		goto yy47;
 yy495:
-	YYDEBUG(495, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy551;
-	if (yych == 'd') goto yy551;
-	goto yy40;
+		YYDEBUG(495, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'H') goto yy572;
+		if (yych == 'h') goto yy572;
+		goto yy47;
 yy496:
-	YYDEBUG(496, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy552;
-	if (yych == 'a') goto yy552;
-	goto yy40;
+		YYDEBUG(496, *YYCURSOR);
+		yyaccept = 45;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy497:
-	YYDEBUG(497, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy553;
-	if (yych == 'a') goto yy553;
-	goto yy40;
+		YYDEBUG(497, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_THROW);
+}
 yy498:
-	YYDEBUG(498, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy554;
-	if (yych == 'e') goto yy554;
-	goto yy40;
+		YYDEBUG(498, *YYCURSOR);
+		yyaccept = 46;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy499:
-	YYDEBUG(499, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy556;
-	if (yych == 't') goto yy556;
-	goto yy40;
+		YYDEBUG(499, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_TRAIT);
+}
 yy500:
-	YYDEBUG(500, yych);
-	yyaccept = 54;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(500, *YYCURSOR);
+		yyaccept = 47;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy501:
-	YYDEBUG(501, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_PUBLIC);
+		YYDEBUG(501, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_UNSET);
 }
 yy502:
-	YYDEBUG(502, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy557;
-	if (yych == 'l') goto yy557;
-	goto yy40;
+		YYDEBUG(502, *YYCURSOR);
+		yyaccept = 48;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy503:
-	YYDEBUG(503, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy558;
-	if (yych == 'e') goto yy558;
-	goto yy40;
+		YYDEBUG(503, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_WHILE);
+}
 yy504:
-	YYDEBUG(504, yych);
-	yyaccept = 55;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(504, *YYCURSOR);
+		yyaccept = 49;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych <= '\r') {
+			if (yych <= 0x08) goto yy505;
+			if (yych <= '\n') goto yy574;
+			if (yych >= '\r') goto yy574;
+		} else {
+			if (yych <= ' ') {
+				if (yych >= ' ') goto yy574;
+			} else {
+				if (yych == '\\') goto yy160;
+			}
+		}
 yy505:
-	YYDEBUG(505, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_RETURN);
+		YYDEBUG(505, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_YIELD);
 }
 yy506:
-	YYDEBUG(506, yych);
-	yyaccept = 56;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(506, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy576;
+		if (yych == 's') goto yy576;
+		goto yy47;
 yy507:
-	YYDEBUG(507, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_STATIC);
-}
+		YYDEBUG(507, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy577;
+		goto yy47;
 yy508:
-	YYDEBUG(508, yych);
-	yyaccept = 57;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(508, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy578;
+		if (yych == 'e') goto yy578;
+		goto yy47;
 yy509:
-	YYDEBUG(509, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_SWITCH);
-}
+		YYDEBUG(509, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy579;
+		if (yych == 'c') goto yy579;
+		goto yy47;
 yy510:
-	YYDEBUG(510, yych);
-	++YYCURSOR;
-	YYFILL(5);
-	yych = *YYCURSOR;
-	if (yych <= 0x1F) {
-		if (yych <= '\n') {
-			if (yych <= 0x08) goto yy71;
-			goto yy510;
-		} else {
-			if (yych == '\r') goto yy510;
-			goto yy71;
-		}
-	} else {
-		if (yych <= 'F') {
-			if (yych <= ' ') goto yy510;
-			if (yych <= 'E') goto yy71;
-			goto yy560;
-		} else {
-			if (yych == 'f') goto yy560;
-			goto yy71;
-		}
-	}
+		YYDEBUG(510, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy580;
+		if (yych == 't') goto yy580;
+		goto yy47;
 yy511:
-	YYDEBUG(511, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy561;
-	if (yych == 's') goto yy561;
-	goto yy40;
+		YYDEBUG(511, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy581;
+		if (yych == 'e') goto yy581;
+		goto yy47;
 yy512:
-	YYDEBUG(512, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy562;
-	goto yy40;
+		YYDEBUG(512, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'H') goto yy582;
+		if (yych == 'h') goto yy582;
+		goto yy47;
 yy513:
-	YYDEBUG(513, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy564;
-	goto yy40;
+		YYDEBUG(513, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy583;
+		if (yych == 'e') goto yy583;
+		goto yy47;
 yy514:
-	YYDEBUG(514, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy565;
-	if (yych == 't') goto yy565;
-	goto yy40;
+		YYDEBUG(514, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy584;
+		if (yych == 'i') goto yy584;
+		goto yy47;
 yy515:
-	YYDEBUG(515, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy566;
-	goto yy40;
-yy516:
-	YYDEBUG(516, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy567;
-	goto yy40;
+		YYDEBUG(515, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(516, *YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych == '\t') goto yy515;
+			goto yy85;
+		} else {
+			if (yych <= ' ') goto yy515;
+			if (yych == ')') goto yy585;
+			goto yy85;
+		}
 yy517:
-	YYDEBUG(517, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy568;
-	if (yych == 'o') goto yy568;
-	goto yy40;
+		YYDEBUG(517, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'Y') goto yy587;
+		if (yych == 'y') goto yy587;
+		goto yy85;
 yy518:
-	YYDEBUG(518, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy569;
-	if (yych == 's') goto yy569;
-	goto yy40;
+		YYDEBUG(518, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 yy519:
-	YYDEBUG(519, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy570;
-	if (yych == 't') goto yy570;
-	goto yy40;
-yy520:
-	YYDEBUG(520, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN(T_ARRAY_CAST);
+		YYDEBUG(519, *YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych == '\t') goto yy518;
+			goto yy85;
+		} else {
+			if (yych <= ' ') goto yy518;
+			if (yych != ')') goto yy85;
+		}
+		YYDEBUG(520, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(521, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN(T_BOOL_CAST);
 }
-yy521:
-	YYDEBUG(521, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= 0x1F) {
-		if (yych == '\t') goto yy521;
-		goto yy71;
-	} else {
-		if (yych <= ' ') goto yy521;
-		if (yych == ')') goto yy571;
-		goto yy71;
-	}
 yy522:
-	YYDEBUG(522, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy459;
-	if (yych == 'n') goto yy459;
-	goto yy71;
+		YYDEBUG(522, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'A') goto yy589;
+		if (yych == 'a') goto yy589;
+		goto yy85;
 yy523:
-	YYDEBUG(523, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN(T_DOUBLE_CAST);
-}
+		YYDEBUG(523, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy524;
+		if (yych != 'e') goto yy85;
 yy524:
-	YYDEBUG(524, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy371;
-	if (yych == 'r') goto yy371;
-	goto yy71;
-yy525:
-	YYDEBUG(525, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= 0x1F) {
-		if (yych == '\t') goto yy525;
-		goto yy71;
-	} else {
-		if (yych <= ' ') goto yy525;
-		if (yych == ')') goto yy572;
-		goto yy71;
-	}
+		YYDEBUG(524, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(525, *YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych == '\t') goto yy524;
+			goto yy85;
+		} else {
+			if (yych <= ' ') goto yy524;
+			if (yych == ')') goto yy590;
+			goto yy85;
+		}
 yy526:
-	YYDEBUG(526, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN(T_UNSET_CAST);
-}
+		YYDEBUG(526, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy592;
+		if (yych == 'e') goto yy592;
+		goto yy85;
 yy527:
-	YYDEBUG(527, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy573;
-	if (yych == 't') goto yy573;
-	goto yy40;
+		YYDEBUG(527, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'T') goto yy593;
+		if (yych == 't') goto yy593;
+		goto yy85;
 yy528:
-	YYDEBUG(528, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy575;
-	if (yych == 'e') goto yy575;
-	goto yy40;
-yy529:
-	YYDEBUG(529, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy577;
-	if (yych == 'e') goto yy577;
-	goto yy40;
+		YYDEBUG(528, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(529, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	if (PARSER_MODE()) {
+		zend_throw_exception(zend_ce_parse_error, "The (real) cast has been removed, use (float) instead", 0);
+		RETURN_TOKEN(T_ERROR);
+	}
+	RETURN_TOKEN(T_DOUBLE_CAST);
+}
 yy530:
-	YYDEBUG(530, yych);
-	yyaccept = 58;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(530, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'G') goto yy587;
+		if (yych == 'g') goto yy587;
+		goto yy85;
 yy531:
-	YYDEBUG(531, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_DECLARE);
-}
-yy532:
-	YYDEBUG(532, yych);
-	yyaccept = 59;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(531, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(532, *YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych == '\t') goto yy531;
+			goto yy85;
+		} else {
+			if (yych <= ' ') goto yy531;
+			if (yych == ')') goto yy595;
+			goto yy85;
+		}
 yy533:
-	YYDEBUG(533, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_DEFAULT);
-}
+		YYDEBUG(533, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\n') goto yy439;
+		if (yych == '\r') goto yy441;
+		goto yy85;
 yy534:
-	YYDEBUG(534, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy579;
-	if (yych == 'a') goto yy579;
-	goto yy40;
+		YYDEBUG(534, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy597;
+		if (yych == 'c') goto yy597;
+		goto yy47;
 yy535:
-	YYDEBUG(535, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy580;
-	if (yych == 'a') goto yy580;
-	goto yy40;
+		YYDEBUG(535, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy598;
+		if (yych == 'l') goto yy598;
+		goto yy47;
 yy536:
-	YYDEBUG(536, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy581;
-	if (yych == 'c') goto yy581;
-	goto yy40;
+		YYDEBUG(536, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'U') goto yy599;
+		if (yych == 'u') goto yy599;
+		goto yy47;
 yy537:
-	YYDEBUG(537, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy582;
-	if (yych == 'e') goto yy582;
-	goto yy40;
+		YYDEBUG(537, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy600;
+		if (yych == 'e') goto yy600;
+		goto yy47;
 yy538:
-	YYDEBUG(538, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy584;
-	if (yych == 't') goto yy584;
-	goto yy71;
+		YYDEBUG(538, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy602;
+		if (yych == 't') goto yy602;
+		goto yy47;
 yy539:
-	YYDEBUG(539, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'P') goto yy585;
-	if (yych == 'p') goto yy585;
-	goto yy71;
+		YYDEBUG(539, *YYCURSOR);
+		yyaccept = 50;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy540:
-	YYDEBUG(540, yych);
-	yyaccept = 60;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy541:
-	YYDEBUG(541, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_EXTENDS);
+		YYDEBUG(540, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ELSEIF);
 }
+yy541:
+		YYDEBUG(541, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy604;
+		if (yych == 'l') goto yy604;
+		goto yy47;
 yy542:
-	YYDEBUG(542, yych);
-	yyaccept = 61;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(542, *YYCURSOR);
+		yyaccept = 51;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\\') {
+			if (yych <= 'D') {
+				if (yych <= '/') goto yy543;
+				if (yych <= '9') goto yy46;
+				if (yych >= 'A') goto yy46;
+			} else {
+				if (yych <= 'E') goto yy605;
+				if (yych <= 'Z') goto yy46;
+				if (yych >= '\\') goto yy160;
+			}
+		} else {
+			if (yych <= 'd') {
+				if (yych == '_') goto yy46;
+				if (yych >= 'a') goto yy46;
+			} else {
+				if (yych <= 'e') goto yy605;
+				if (yych <= 'z') goto yy46;
+				if (yych >= 0x80) goto yy46;
+			}
+		}
 yy543:
-	YYDEBUG(543, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_FINALLY);
+		YYDEBUG(543, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ENDFOR);
 }
 yy544:
-	YYDEBUG(544, yych);
-	yyaccept = 62;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(544, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy606;
+		if (yych == 't') goto yy606;
+		goto yy47;
 yy545:
-	YYDEBUG(545, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_FOREACH);
-}
+		YYDEBUG(545, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy607;
+		if (yych == 'l') goto yy607;
+		goto yy47;
 yy546:
-	YYDEBUG(546, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy586;
-	if (yych == 'n') goto yy586;
-	goto yy40;
+		YYDEBUG(546, *YYCURSOR);
+		++YYCURSOR;
 yy547:
-	YYDEBUG(547, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy588;
-	if (yych == 'n') goto yy588;
-	goto yy40;
+		YYDEBUG(547, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	yyless(4);
+	RETURN_TOKEN_WITH_IDENT(T_ENUM);
+}
 yy548:
-	YYDEBUG(548, yych);
-	yyaccept = 63;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '\\') {
-		if (yych <= '@') {
-			if (yych <= '/') goto yy549;
-			if (yych <= '9') goto yy39;
-		} else {
-			if (yych <= 'Z') goto yy39;
-			if (yych >= '\\') goto yy127;
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych == '_') goto yy589;
-		} else {
-			if (yych <= 'z') goto yy39;
-			if (yych >= 0x80) goto yy39;
-		}
-	}
+		YYDEBUG(548, *YYCURSOR);
+		yyaccept = 52;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'X') goto yy608;
+		if (yych == 'x') goto yy608;
+		goto yy547;
 yy549:
-	YYDEBUG(549, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_INCLUDE);
-}
+		YYDEBUG(549, *YYCURSOR);
+		yyaccept = 52;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'M') goto yy609;
+		if (yych == 'm') goto yy609;
+		goto yy547;
 yy550:
-	YYDEBUG(550, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy590;
-	if (yych == 'e') goto yy590;
-	goto yy40;
+		YYDEBUG(550, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy610;
+		if (yych == 's') goto yy610;
+		goto yy47;
 yy551:
-	YYDEBUG(551, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy591;
-	if (yych == 'o') goto yy591;
-	goto yy40;
+		YYDEBUG(551, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'Y') goto yy612;
+		if (yych == 'y') goto yy612;
+		goto yy47;
 yy552:
-	YYDEBUG(552, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy592;
-	if (yych == 'c') goto yy592;
-	goto yy40;
+		YYDEBUG(552, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'H') goto yy614;
+		if (yych == 'h') goto yy614;
+		goto yy47;
 yy553:
-	YYDEBUG(553, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy593;
-	if (yych == 'c') goto yy593;
-	goto yy40;
+		YYDEBUG(553, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy616;
+		if (yych == 'o') goto yy616;
+		goto yy47;
 yy554:
-	YYDEBUG(554, yych);
-	yyaccept = 64;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(554, *YYCURSOR);
+		yyaccept = 53;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy555:
-	YYDEBUG(555, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_PRIVATE);
+		YYDEBUG(555, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_GLOBAL);
 }
 yy556:
-	YYDEBUG(556, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy594;
-	if (yych == 'e') goto yy594;
-	goto yy40;
+		YYDEBUG(556, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy617;
+		if (yych == 'e') goto yy617;
+		goto yy47;
 yy557:
-	YYDEBUG(557, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'Y') goto yy595;
-	if (yych == 'y') goto yy595;
-	goto yy40;
+		YYDEBUG(557, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy618;
+		if (yych == 'e') goto yy618;
+		goto yy47;
 yy558:
-	YYDEBUG(558, yych);
-	yyaccept = 65;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '\\') {
-		if (yych <= '@') {
-			if (yych <= '/') goto yy559;
-			if (yych <= '9') goto yy39;
-		} else {
-			if (yych <= 'Z') goto yy39;
-			if (yych >= '\\') goto yy127;
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych == '_') goto yy597;
-		} else {
-			if (yych <= 'z') goto yy39;
-			if (yych >= 0x80) goto yy39;
-		}
-	}
+		YYDEBUG(558, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy620;
+		if (yych == 'c') goto yy620;
+		goto yy47;
 yy559:
-	YYDEBUG(559, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_REQUIRE);
-}
+		YYDEBUG(559, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy621;
+		if (yych == 'd') goto yy621;
+		goto yy47;
 yy560:
-	YYDEBUG(560, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'R') goto yy598;
-	if (yych == 'r') goto yy598;
-	goto yy71;
+		YYDEBUG(560, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy622;
+		if (yych == 'a') goto yy622;
+		goto yy47;
 yy561:
-	YYDEBUG(561, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy599;
-	goto yy40;
+		YYDEBUG(561, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy623;
+		if (yych == 'a') goto yy623;
+		goto yy47;
 yy562:
-	YYDEBUG(562, yych);
-	yyaccept = 66;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(562, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy624;
+		if (yych == 'e') goto yy624;
+		goto yy47;
 yy563:
-	YYDEBUG(563, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_DIR);
-}
+		YYDEBUG(563, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy626;
+		if (yych == 't') goto yy626;
+		goto yy47;
 yy564:
-	YYDEBUG(564, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy600;
-	goto yy40;
+		YYDEBUG(564, *YYCURSOR);
+		yyaccept = 54;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy565:
-	YYDEBUG(565, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy602;
-	if (yych == 'i') goto yy602;
-	goto yy40;
+		YYDEBUG(565, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_PUBLIC);
+}
 yy566:
-	YYDEBUG(566, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy603;
-	if (yych == 'c') goto yy603;
-	goto yy40;
+		YYDEBUG(566, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy627;
+		if (yych == 'l') goto yy627;
+		goto yy47;
 yy567:
-	YYDEBUG(567, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy604;
-	goto yy40;
+		YYDEBUG(567, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy628;
+		if (yych == 'e') goto yy628;
+		goto yy47;
 yy568:
-	YYDEBUG(568, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy606;
-	if (yych == 'd') goto yy606;
-	goto yy40;
+		YYDEBUG(568, *YYCURSOR);
+		yyaccept = 55;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy569:
-	YYDEBUG(569, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'P') goto yy607;
-	if (yych == 'p') goto yy607;
-	goto yy40;
+		YYDEBUG(569, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_RETURN);
+}
 yy570:
-	YYDEBUG(570, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy608;
-	goto yy40;
+		YYDEBUG(570, *YYCURSOR);
+		yyaccept = 56;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy571:
-	YYDEBUG(571, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN(T_STRING_CAST);
+		YYDEBUG(571, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_STATIC);
 }
 yy572:
-	YYDEBUG(572, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN(T_OBJECT_CAST);
-}
+		YYDEBUG(572, *YYCURSOR);
+		yyaccept = 57;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy573:
-	YYDEBUG(573, yych);
-	yyaccept = 67;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy574:
-	YYDEBUG(574, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ABSTRACT);
+		YYDEBUG(573, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_SWITCH);
 }
-yy575:
-	YYDEBUG(575, yych);
-	yyaccept = 68;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+yy574:
+		YYDEBUG(574, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(5);
+		yych = *YYCURSOR;
+		YYDEBUG(575, *YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych <= '\n') {
+				if (yych <= 0x08) goto yy85;
+				goto yy574;
+			} else {
+				if (yych == '\r') goto yy574;
+				goto yy85;
+			}
+		} else {
+			if (yych <= 'F') {
+				if (yych <= ' ') goto yy574;
+				if (yych <= 'E') goto yy85;
+				goto yy630;
+			} else {
+				if (yych == 'f') goto yy630;
+				goto yy85;
+			}
+		}
 yy576:
-	YYDEBUG(576, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_CALLABLE);
-}
+		YYDEBUG(576, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy631;
+		if (yych == 's') goto yy631;
+		goto yy47;
 yy577:
-	YYDEBUG(577, yych);
-	yyaccept = 69;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(577, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy632;
+		goto yy47;
 yy578:
-	YYDEBUG(578, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_CONTINUE);
-}
+		YYDEBUG(578, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy634;
+		goto yy47;
 yy579:
-	YYDEBUG(579, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy609;
-	if (yych == 'r') goto yy609;
-	goto yy40;
+		YYDEBUG(579, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy635;
+		if (yych == 't') goto yy635;
+		goto yy47;
 yy580:
-	YYDEBUG(580, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy610;
-	if (yych == 'c') goto yy610;
-	goto yy40;
+		YYDEBUG(580, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy636;
+		goto yy47;
 yy581:
-	YYDEBUG(581, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'H') goto yy611;
-	if (yych == 'h') goto yy611;
-	goto yy40;
+		YYDEBUG(581, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy637;
+		goto yy47;
 yy582:
-	YYDEBUG(582, yych);
-	yyaccept = 70;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(582, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy638;
+		if (yych == 'o') goto yy638;
+		goto yy47;
 yy583:
-	YYDEBUG(583, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ENDWHILE);
-}
+		YYDEBUG(583, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy639;
+		if (yych == 's') goto yy639;
+		goto yy47;
 yy584:
-	YYDEBUG(584, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy613;
-	if (yych == 'e') goto yy613;
-	goto yy71;
+		YYDEBUG(584, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy640;
+		if (yych == 't') goto yy640;
+		goto yy47;
 yy585:
-	YYDEBUG(585, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'L') goto yy614;
-	if (yych == 'l') goto yy614;
-	goto yy71;
-yy586:
-	YYDEBUG(586, yych);
-	yyaccept = 71;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy587:
-	YYDEBUG(587, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_FUNCTION);
+		YYDEBUG(585, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(586, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN(T_ARRAY_CAST);
 }
-yy588:
-	YYDEBUG(588, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'T') goto yy615;
-	if (yych == 't') goto yy615;
-	goto yy40;
+yy587:
+		YYDEBUG(587, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(588, *YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych == '\t') goto yy587;
+			goto yy85;
+		} else {
+			if (yych <= ' ') goto yy587;
+			if (yych == ')') goto yy641;
+			goto yy85;
+		}
 yy589:
-	YYDEBUG(589, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy616;
-	if (yych == 'o') goto yy616;
-	goto yy40;
+		YYDEBUG(589, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'N') goto yy518;
+		if (yych == 'n') goto yy518;
+		goto yy85;
 yy590:
-	YYDEBUG(590, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy617;
-	if (yych == 'o') goto yy617;
-	goto yy40;
-yy591:
-	YYDEBUG(591, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'F') goto yy618;
-	if (yych == 'f') goto yy618;
-	goto yy40;
+		YYDEBUG(590, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(591, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN(T_DOUBLE_CAST);
+}
 yy592:
-	YYDEBUG(592, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy620;
-	if (yych == 'e') goto yy620;
-	goto yy40;
+		YYDEBUG(592, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'R') goto yy425;
+		if (yych == 'r') goto yy425;
+		goto yy85;
 yy593:
-	YYDEBUG(593, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy622;
-	if (yych == 'e') goto yy622;
-	goto yy40;
-yy594:
-	YYDEBUG(594, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy624;
-	if (yych == 'd') goto yy624;
-	goto yy40;
+		YYDEBUG(593, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(594, *YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych == '\t') goto yy593;
+			goto yy85;
+		} else {
+			if (yych <= ' ') goto yy593;
+			if (yych == ')') goto yy643;
+			goto yy85;
+		}
 yy595:
-	YYDEBUG(595, yych);
-	yyaccept = 72;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy596:
-	YYDEBUG(596, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_READONLY);
+		YYDEBUG(595, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(596, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN(T_UNSET_CAST);
 }
 yy597:
-	YYDEBUG(597, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy626;
-	if (yych == 'o') goto yy626;
-	goto yy40;
+		YYDEBUG(597, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy645;
+		if (yych == 't') goto yy645;
+		goto yy47;
 yy598:
-	YYDEBUG(598, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'O') goto yy627;
-	if (yych == 'o') goto yy627;
-	goto yy71;
+		YYDEBUG(598, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy647;
+		if (yych == 'e') goto yy647;
+		goto yy47;
 yy599:
-	YYDEBUG(599, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy628;
-	goto yy40;
+		YYDEBUG(599, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy649;
+		if (yych == 'e') goto yy649;
+		goto yy47;
 yy600:
-	YYDEBUG(600, yych);
-	yyaccept = 73;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(600, *YYCURSOR);
+		yyaccept = 58;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy601:
-	YYDEBUG(601, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_FILE);
+		YYDEBUG(601, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_DECLARE);
 }
 yy602:
-	YYDEBUG(602, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy630;
-	if (yych == 'o') goto yy630;
-	goto yy40;
+		YYDEBUG(602, *YYCURSOR);
+		yyaccept = 59;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy603:
-	YYDEBUG(603, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy631;
-	if (yych == 'o') goto yy631;
-	goto yy40;
+		YYDEBUG(603, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_DEFAULT);
+}
 yy604:
-	YYDEBUG(604, yych);
-	yyaccept = 74;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(604, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy651;
+		if (yych == 'a') goto yy651;
+		goto yy47;
 yy605:
-	YYDEBUG(605, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_LINE);
-}
+		YYDEBUG(605, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy652;
+		if (yych == 'a') goto yy652;
+		goto yy47;
 yy606:
-	YYDEBUG(606, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy632;
-	goto yy40;
+		YYDEBUG(606, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy653;
+		if (yych == 'c') goto yy653;
+		goto yy47;
 yy607:
-	YYDEBUG(607, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy633;
-	if (yych == 'a') goto yy633;
-	goto yy40;
+		YYDEBUG(607, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy654;
+		if (yych == 'e') goto yy654;
+		goto yy47;
 yy608:
-	YYDEBUG(608, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy634;
-	goto yy40;
+		YYDEBUG(608, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'T') goto yy656;
+		if (yych == 't') goto yy656;
+		goto yy85;
 yy609:
-	YYDEBUG(609, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy636;
-	if (yych == 'e') goto yy636;
-	goto yy40;
+		YYDEBUG(609, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'P') goto yy657;
+		if (yych == 'p') goto yy657;
+		goto yy85;
 yy610:
-	YYDEBUG(610, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'H') goto yy638;
-	if (yych == 'h') goto yy638;
-	goto yy40;
+		YYDEBUG(610, *YYCURSOR);
+		yyaccept = 60;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy611:
-	YYDEBUG(611, yych);
-	yyaccept = 75;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy612:
-	YYDEBUG(612, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ENDSWITCH);
+		YYDEBUG(611, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_EXTENDS);
 }
+yy612:
+		YYDEBUG(612, *YYCURSOR);
+		yyaccept = 61;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy613:
-	YYDEBUG(613, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy640;
-	if (yych == 'n') goto yy640;
-	goto yy71;
+		YYDEBUG(613, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_FINALLY);
+}
 yy614:
-	YYDEBUG(614, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy641;
-	if (yych == 'e') goto yy641;
-	goto yy71;
+		YYDEBUG(614, *YYCURSOR);
+		yyaccept = 62;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy615:
-	YYDEBUG(615, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy642;
-	if (yych == 's') goto yy642;
-	goto yy40;
+		YYDEBUG(615, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_FOREACH);
+}
 yy616:
-	YYDEBUG(616, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy644;
-	if (yych == 'n') goto yy644;
-	goto yy40;
+		YYDEBUG(616, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy658;
+		if (yych == 'n') goto yy658;
+		goto yy47;
 yy617:
-	YYDEBUG(617, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'F') goto yy645;
-	if (yych == 'f') goto yy645;
-	goto yy40;
+		YYDEBUG(617, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy660;
+		if (yych == 'n') goto yy660;
+		goto yy47;
 yy618:
-	YYDEBUG(618, yych);
-	yyaccept = 76;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(618, *YYCURSOR);
+		yyaccept = 63;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\\') {
+			if (yych <= '@') {
+				if (yych <= '/') goto yy619;
+				if (yych <= '9') goto yy46;
+			} else {
+				if (yych <= 'Z') goto yy46;
+				if (yych >= '\\') goto yy160;
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych == '_') goto yy661;
+			} else {
+				if (yych <= 'z') goto yy46;
+				if (yych >= 0x80) goto yy46;
+			}
+		}
 yy619:
-	YYDEBUG(619, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-    RETURN_TOKEN_WITH_IDENT(T_INSTEADOF);
+		YYDEBUG(619, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_INCLUDE);
 }
 yy620:
-	YYDEBUG(620, yych);
-	yyaccept = 77;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(620, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy662;
+		if (yych == 'e') goto yy662;
+		goto yy47;
 yy621:
-	YYDEBUG(621, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_INTERFACE);
-}
+		YYDEBUG(621, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy663;
+		if (yych == 'o') goto yy663;
+		goto yy47;
 yy622:
-	YYDEBUG(622, yych);
-	yyaccept = 78;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy647;
+		YYDEBUG(622, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy664;
+		if (yych == 'c') goto yy664;
+		goto yy47;
 yy623:
-	YYDEBUG(623, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_NAMESPACE);
-}
+		YYDEBUG(623, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy665;
+		if (yych == 'c') goto yy665;
+		goto yy47;
 yy624:
-	YYDEBUG(624, yych);
-	yyaccept = 79;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(624, *YYCURSOR);
+		yyaccept = 64;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy625:
-	YYDEBUG(625, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_PROTECTED);
+		YYDEBUG(625, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_PRIVATE);
 }
 yy626:
-	YYDEBUG(626, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy648;
-	if (yych == 'n') goto yy648;
-	goto yy40;
+		YYDEBUG(626, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy666;
+		if (yych == 'e') goto yy666;
+		goto yy47;
 yy627:
-	YYDEBUG(627, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy649;
-	if (yych == 'm') goto yy649;
-	goto yy71;
+		YYDEBUG(627, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'Y') goto yy667;
+		if (yych == 'y') goto yy667;
+		goto yy47;
 yy628:
-	YYDEBUG(628, yych);
-	yyaccept = 80;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(628, *YYCURSOR);
+		yyaccept = 65;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\\') {
+			if (yych <= '@') {
+				if (yych <= '/') goto yy629;
+				if (yych <= '9') goto yy46;
+			} else {
+				if (yych <= 'Z') goto yy46;
+				if (yych >= '\\') goto yy160;
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych == '_') goto yy669;
+			} else {
+				if (yych <= 'z') goto yy46;
+				if (yych >= 0x80) goto yy46;
+			}
+		}
 yy629:
-	YYDEBUG(629, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_CLASS_C);
+		YYDEBUG(629, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_REQUIRE);
 }
 yy630:
-	YYDEBUG(630, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy650;
-	if (yych == 'n') goto yy650;
-	goto yy40;
+		YYDEBUG(630, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'R') goto yy670;
+		if (yych == 'r') goto yy670;
+		goto yy85;
 yy631:
-	YYDEBUG(631, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'M') goto yy651;
-	if (yych == 'm') goto yy651;
-	goto yy40;
+		YYDEBUG(631, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy671;
+		goto yy47;
 yy632:
-	YYDEBUG(632, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy652;
-	goto yy40;
+		YYDEBUG(632, *YYCURSOR);
+		yyaccept = 66;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy633:
-	YYDEBUG(633, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy654;
-	if (yych == 'c') goto yy654;
-	goto yy40;
+		YYDEBUG(633, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_DIR);
+}
 yy634:
-	YYDEBUG(634, yych);
-	yyaccept = 81;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(634, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy672;
+		goto yy47;
 yy635:
-	YYDEBUG(635, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_TRAIT_C);
-}
+		YYDEBUG(635, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy674;
+		if (yych == 'i') goto yy674;
+		goto yy47;
 yy636:
-	YYDEBUG(636, yych);
-	yyaccept = 82;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(636, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy675;
+		if (yych == 'c') goto yy675;
+		goto yy47;
 yy637:
-	YYDEBUG(637, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ENDDECLARE);
-}
+		YYDEBUG(637, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy676;
+		goto yy47;
 yy638:
-	YYDEBUG(638, yych);
-	yyaccept = 83;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(638, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy678;
+		if (yych == 'd') goto yy678;
+		goto yy47;
 yy639:
-	YYDEBUG(639, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_ENDFOREACH);
-}
+		YYDEBUG(639, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'P') goto yy679;
+		if (yych == 'p') goto yy679;
+		goto yy47;
 yy640:
-	YYDEBUG(640, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'D') goto yy655;
-	if (yych == 'd') goto yy655;
-	goto yy71;
+		YYDEBUG(640, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy680;
+		goto yy47;
 yy641:
-	YYDEBUG(641, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'M') goto yy656;
-	if (yych == 'm') goto yy656;
-	goto yy71;
-yy642:
-	YYDEBUG(642, yych);
-	yyaccept = 84;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(641, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(642, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN(T_STRING_CAST);
+}
 yy643:
-	YYDEBUG(643, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_IMPLEMENTS);
+		YYDEBUG(643, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(644, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN(T_OBJECT_CAST);
 }
-yy644:
-	YYDEBUG(644, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy657;
-	if (yych == 'c') goto yy657;
-	goto yy40;
 yy645:
-	YYDEBUG(645, yych);
-	yyaccept = 85;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(645, *YYCURSOR);
+		yyaccept = 67;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy646:
-	YYDEBUG(646, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_INSTANCEOF);
+		YYDEBUG(646, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ABSTRACT);
 }
 yy647:
-	YYDEBUG(647, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy71;
-		if (yych <= 'Z') goto yy658;
-		if (yych <= '^') goto yy71;
-		goto yy658;
-	} else {
-		if (yych <= '`') goto yy71;
-		if (yych <= 'z') goto yy658;
-		if (yych <= 0x7F) goto yy71;
-		goto yy658;
-	}
+		YYDEBUG(647, *YYCURSOR);
+		yyaccept = 68;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy648:
-	YYDEBUG(648, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'C') goto yy660;
-	if (yych == 'c') goto yy660;
-	goto yy40;
+		YYDEBUG(648, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_CALLABLE);
+}
 yy649:
-	YYDEBUG(649, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '^') {
-		if (yych <= '9') {
-			if (yych <= '/') goto yy661;
-			goto yy71;
-		} else {
-			if (yych <= '@') goto yy661;
-			if (yych <= 'Z') goto yy71;
-			goto yy661;
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= '_') goto yy71;
-			goto yy661;
-		} else {
-			if (yych <= 'z') goto yy71;
-			if (yych <= 0x7F) goto yy661;
-			goto yy71;
+		YYDEBUG(649, *YYCURSOR);
+		yyaccept = 69;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
 		}
-	}
+		if (yych == '\\') goto yy160;
 yy650:
-	YYDEBUG(650, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy662;
-	goto yy40;
+		YYDEBUG(650, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_CONTINUE);
+}
 yy651:
-	YYDEBUG(651, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'P') goto yy663;
-	if (yych == 'p') goto yy663;
-	goto yy40;
+		YYDEBUG(651, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy681;
+		if (yych == 'r') goto yy681;
+		goto yy47;
 yy652:
-	YYDEBUG(652, yych);
-	yyaccept = 86;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(652, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy682;
+		if (yych == 'c') goto yy682;
+		goto yy47;
 yy653:
-	YYDEBUG(653, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_METHOD_C);
-}
+		YYDEBUG(653, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'H') goto yy683;
+		if (yych == 'h') goto yy683;
+		goto yy47;
 yy654:
-	YYDEBUG(654, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy664;
-	if (yych == 'e') goto yy664;
-	goto yy40;
+		YYDEBUG(654, *YYCURSOR);
+		yyaccept = 70;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy655:
-	YYDEBUG(655, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'S') goto yy665;
-	if (yych == 's') goto yy665;
-	goto yy71;
+		YYDEBUG(655, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ENDWHILE);
+}
 yy656:
-	YYDEBUG(656, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'E') goto yy666;
-	if (yych == 'e') goto yy666;
-	goto yy71;
+		YYDEBUG(656, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy685;
+		if (yych == 'e') goto yy685;
+		goto yy85;
 yy657:
-	YYDEBUG(657, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy667;
-	if (yych == 'e') goto yy667;
-	goto yy40;
+		YYDEBUG(657, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'L') goto yy686;
+		if (yych == 'l') goto yy686;
+		goto yy85;
 yy658:
-	YYDEBUG(658, yych);
-	yyaccept = 87;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\\') {
-		if (yych <= '@') {
-			if (yych <= '/') goto yy659;
-			if (yych <= '9') goto yy658;
-		} else {
-			if (yych <= 'Z') goto yy658;
-			if (yych >= '\\') goto yy647;
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych == '_') goto yy658;
-		} else {
-			if (yych <= 'z') goto yy658;
-			if (yych >= 0x80) goto yy658;
+		YYDEBUG(658, *YYCURSOR);
+		yyaccept = 71;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
 		}
-	}
+		if (yych == '\\') goto yy160;
 yy659:
-	YYDEBUG(659, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_STR(T_NAME_RELATIVE, sizeof("namespace\\") - 1);
+		YYDEBUG(659, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_FUNCTION);
 }
 yy660:
-	YYDEBUG(660, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy669;
-	if (yych == 'e') goto yy669;
-	goto yy40;
+		YYDEBUG(660, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'T') goto yy687;
+		if (yych == 't') goto yy687;
+		goto yy47;
 yy661:
-	YYDEBUG(661, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	yyless(yyleng - 1);
-	HANDLE_NEWLINES(yytext, yyleng);
-	RETURN_TOKEN_WITH_IDENT(T_YIELD_FROM);
-}
+		YYDEBUG(661, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy688;
+		if (yych == 'o') goto yy688;
+		goto yy47;
 yy662:
-	YYDEBUG(662, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy671;
-	goto yy40;
+		YYDEBUG(662, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy689;
+		if (yych == 'o') goto yy689;
+		goto yy47;
 yy663:
-	YYDEBUG(663, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy673;
-	if (yych == 'i') goto yy673;
-	goto yy40;
+		YYDEBUG(663, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'F') goto yy690;
+		if (yych == 'f') goto yy690;
+		goto yy47;
 yy664:
-	YYDEBUG(664, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy674;
-	goto yy40;
+		YYDEBUG(664, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy692;
+		if (yych == 'e') goto yy692;
+		goto yy47;
 yy665:
-	YYDEBUG(665, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	yyless(4);
-	RETURN_TOKEN_WITH_STR(T_STRING, 0);
-}
+		YYDEBUG(665, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy694;
+		if (yych == 'e') goto yy694;
+		goto yy47;
 yy666:
-	YYDEBUG(666, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy675;
-	if (yych == 'n') goto yy675;
-	goto yy71;
+		YYDEBUG(666, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy696;
+		if (yych == 'd') goto yy696;
+		goto yy47;
 yy667:
-	YYDEBUG(667, yych);
-	yyaccept = 88;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(667, *YYCURSOR);
+		yyaccept = 72;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy668:
-	YYDEBUG(668, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_INCLUDE_ONCE);
+		YYDEBUG(668, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_READONLY);
 }
 yy669:
-	YYDEBUG(669, yych);
-	yyaccept = 89;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(669, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy698;
+		if (yych == 'o') goto yy698;
+		goto yy47;
 yy670:
-	YYDEBUG(670, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_REQUIRE_ONCE);
-}
+		YYDEBUG(670, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'O') goto yy699;
+		if (yych == 'o') goto yy699;
+		goto yy85;
 yy671:
-	YYDEBUG(671, yych);
-	yyaccept = 90;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(671, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy700;
+		goto yy47;
 yy672:
-	YYDEBUG(672, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_FUNC_C);
-}
+		YYDEBUG(672, *YYCURSOR);
+		yyaccept = 73;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy673:
-	YYDEBUG(673, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy676;
-	if (yych == 'l') goto yy676;
-	goto yy40;
+		YYDEBUG(673, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_FILE);
+}
 yy674:
-	YYDEBUG(674, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy677;
-	goto yy40;
+		YYDEBUG(674, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy702;
+		if (yych == 'o') goto yy702;
+		goto yy47;
 yy675:
-	YYDEBUG(675, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'T') goto yy655;
-	if (yych == 't') goto yy655;
-	goto yy71;
+		YYDEBUG(675, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy703;
+		if (yych == 'o') goto yy703;
+		goto yy47;
 yy676:
-	YYDEBUG(676, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy679;
-	if (yych == 'e') goto yy679;
-	goto yy40;
+		YYDEBUG(676, *YYCURSOR);
+		yyaccept = 74;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
 yy677:
-	YYDEBUG(677, yych);
-	yyaccept = 91;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
-yy678:
-	YYDEBUG(678, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_NS_C);
+		YYDEBUG(677, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_LINE);
 }
+yy678:
+		YYDEBUG(678, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy704;
+		goto yy47;
 yy679:
-	YYDEBUG(679, yych);
-	yyaccept = 4;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy680;
-	if (yych != 'r') goto yy40;
+		YYDEBUG(679, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy705;
+		if (yych == 'a') goto yy705;
+		goto yy47;
 yy680:
-	YYDEBUG(680, yych);
-	yyaccept = 92;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_ST_IN_SCRIPTING[0+yych] & 8) goto yy39;
-	if (yych == '\\') goto yy127;
+		YYDEBUG(680, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy706;
+		goto yy47;
 yy681:
-	YYDEBUG(681, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
-	RETURN_TOKEN_WITH_IDENT(T_HALT_COMPILER);
+		YYDEBUG(681, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy708;
+		if (yych == 'e') goto yy708;
+		goto yy47;
+yy682:
+		YYDEBUG(682, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'H') goto yy710;
+		if (yych == 'h') goto yy710;
+		goto yy47;
+yy683:
+		YYDEBUG(683, *YYCURSOR);
+		yyaccept = 75;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy684:
+		YYDEBUG(684, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ENDSWITCH);
 }
-/* *********************************** */
-yyc_ST_LOOKING_FOR_PROPERTY:
-	YYFILL(4);
-	yych = *YYCURSOR;
-	YYDEBUG(682, yych);
-	if (yybm_ST_LOOKING_FOR_PROPERTY[0+yych] & 64) goto yy685;
-	if (yych <= '?') {
-		if (yych <= '-') {
-			if (yych == '#') goto yy686;
-			if (yych >= '-') goto yy687;
-		} else {
-			if (yych == '/') goto yy688;
-			if (yych >= '?') goto yy689;
+yy685:
+		YYDEBUG(685, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'N') goto yy712;
+		if (yych == 'n') goto yy712;
+		goto yy85;
+yy686:
+		YYDEBUG(686, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy713;
+		if (yych == 'e') goto yy713;
+		goto yy85;
+yy687:
+		YYDEBUG(687, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy714;
+		if (yych == 's') goto yy714;
+		goto yy47;
+yy688:
+		YYDEBUG(688, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy716;
+		if (yych == 'n') goto yy716;
+		goto yy47;
+yy689:
+		YYDEBUG(689, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'F') goto yy717;
+		if (yych == 'f') goto yy717;
+		goto yy47;
+yy690:
+		YYDEBUG(690, *YYCURSOR);
+		yyaccept = 76;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
 		}
-	} else {
+		if (yych == '\\') goto yy160;
+yy691:
+		YYDEBUG(691, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+    RETURN_TOKEN_WITH_IDENT(T_INSTEADOF);
+}
+yy692:
+		YYDEBUG(692, *YYCURSOR);
+		yyaccept = 77;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy693:
+		YYDEBUG(693, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_INTERFACE);
+}
+yy694:
+		YYDEBUG(694, *YYCURSOR);
+		yyaccept = 78;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy719;
+yy695:
+		YYDEBUG(695, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_NAMESPACE);
+}
+yy696:
+		YYDEBUG(696, *YYCURSOR);
+		yyaccept = 79;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy697:
+		YYDEBUG(697, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_PROTECTED);
+}
+yy698:
+		YYDEBUG(698, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy720;
+		if (yych == 'n') goto yy720;
+		goto yy47;
+yy699:
+		YYDEBUG(699, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'M') goto yy721;
+		if (yych == 'm') goto yy721;
+		goto yy85;
+yy700:
+		YYDEBUG(700, *YYCURSOR);
+		yyaccept = 80;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy701:
+		YYDEBUG(701, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_CLASS_C);
+}
+yy702:
+		YYDEBUG(702, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy722;
+		if (yych == 'n') goto yy722;
+		goto yy47;
+yy703:
+		YYDEBUG(703, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'M') goto yy723;
+		if (yych == 'm') goto yy723;
+		goto yy47;
+yy704:
+		YYDEBUG(704, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy724;
+		goto yy47;
+yy705:
+		YYDEBUG(705, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy726;
+		if (yych == 'c') goto yy726;
+		goto yy47;
+yy706:
+		YYDEBUG(706, *YYCURSOR);
+		yyaccept = 81;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy707:
+		YYDEBUG(707, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_TRAIT_C);
+}
+yy708:
+		YYDEBUG(708, *YYCURSOR);
+		yyaccept = 82;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy709:
+		YYDEBUG(709, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ENDDECLARE);
+}
+yy710:
+		YYDEBUG(710, *YYCURSOR);
+		yyaccept = 83;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy711:
+		YYDEBUG(711, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_ENDFOREACH);
+}
+yy712:
+		YYDEBUG(712, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'D') goto yy727;
+		if (yych == 'd') goto yy727;
+		goto yy85;
+yy713:
+		YYDEBUG(713, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'M') goto yy728;
+		if (yych == 'm') goto yy728;
+		goto yy85;
+yy714:
+		YYDEBUG(714, *YYCURSOR);
+		yyaccept = 84;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy715:
+		YYDEBUG(715, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_IMPLEMENTS);
+}
+yy716:
+		YYDEBUG(716, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy729;
+		if (yych == 'c') goto yy729;
+		goto yy47;
+yy717:
+		YYDEBUG(717, *YYCURSOR);
+		yyaccept = 85;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy718:
+		YYDEBUG(718, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_INSTANCEOF);
+}
+yy719:
+		YYDEBUG(719, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 		if (yych <= '_') {
-			if (yych <= '@') goto yy683;
-			if (yych <= 'Z') goto yy690;
-			if (yych >= '_') goto yy690;
-		} else {
-			if (yych <= '`') goto yy683;
-			if (yych <= 'z') goto yy690;
-			if (yych >= 0x80) goto yy690;
+			if (yych <= '@') goto yy85;
+			if (yych <= 'Z') goto yy730;
+			if (yych <= '^') goto yy85;
+			goto yy730;
+		} else {
+			if (yych <= '`') goto yy85;
+			if (yych <= 'z') goto yy730;
+			if (yych <= 0x7F) goto yy85;
+			goto yy730;
+		}
+yy720:
+		YYDEBUG(720, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'C') goto yy733;
+		if (yych == 'c') goto yy733;
+		goto yy47;
+yy721:
+		YYDEBUG(721, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '^') {
+			if (yych <= '9') {
+				if (yych <= '/') goto yy734;
+				goto yy85;
+			} else {
+				if (yych <= '@') goto yy734;
+				if (yych <= 'Z') goto yy85;
+				goto yy734;
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych <= '_') goto yy85;
+				goto yy734;
+			} else {
+				if (yych <= 'z') goto yy85;
+				if (yych <= 0x7F) goto yy734;
+				goto yy85;
+			}
+		}
+yy722:
+		YYDEBUG(722, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy736;
+		goto yy47;
+yy723:
+		YYDEBUG(723, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'P') goto yy737;
+		if (yych == 'p') goto yy737;
+		goto yy47;
+yy724:
+		YYDEBUG(724, *YYCURSOR);
+		yyaccept = 86;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy725:
+		YYDEBUG(725, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_METHOD_C);
+}
+yy726:
+		YYDEBUG(726, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy738;
+		if (yych == 'e') goto yy738;
+		goto yy47;
+yy727:
+		YYDEBUG(727, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'S') goto yy739;
+		if (yych == 's') goto yy739;
+		goto yy85;
+yy728:
+		YYDEBUG(728, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'E') goto yy741;
+		if (yych == 'e') goto yy741;
+		goto yy85;
+yy729:
+		YYDEBUG(729, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy742;
+		if (yych == 'e') goto yy742;
+		goto yy47;
+yy730:
+		YYDEBUG(730, *YYCURSOR);
+		yyaccept = 87;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(731, *YYCURSOR);
+		if (yych <= '\\') {
+			if (yych <= '@') {
+				if (yych <= '/') goto yy732;
+				if (yych <= '9') goto yy730;
+			} else {
+				if (yych <= 'Z') goto yy730;
+				if (yych >= '\\') goto yy719;
+			}
+		} else {
+			if (yych <= '`') {
+				if (yych == '_') goto yy730;
+			} else {
+				if (yych <= 'z') goto yy730;
+				if (yych >= 0x80) goto yy730;
+			}
+		}
+yy732:
+		YYDEBUG(732, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_STR(T_NAME_RELATIVE, sizeof("namespace\\") - 1);
+}
+yy733:
+		YYDEBUG(733, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy744;
+		if (yych == 'e') goto yy744;
+		goto yy47;
+yy734:
+		YYDEBUG(734, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(735, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	yyless(yyleng - 1);
+	HANDLE_NEWLINES(yytext, yyleng);
+	RETURN_TOKEN_WITH_IDENT(T_YIELD_FROM);
+}
+yy736:
+		YYDEBUG(736, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy746;
+		goto yy47;
+yy737:
+		YYDEBUG(737, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy748;
+		if (yych == 'i') goto yy748;
+		goto yy47;
+yy738:
+		YYDEBUG(738, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy749;
+		goto yy47;
+yy739:
+		YYDEBUG(739, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(740, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	yyless(4);
+	RETURN_TOKEN_WITH_STR(T_STRING, 0);
+}
+yy741:
+		YYDEBUG(741, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'N') goto yy750;
+		if (yych == 'n') goto yy750;
+		goto yy85;
+yy742:
+		YYDEBUG(742, *YYCURSOR);
+		yyaccept = 88;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy743:
+		YYDEBUG(743, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_INCLUDE_ONCE);
+}
+yy744:
+		YYDEBUG(744, *YYCURSOR);
+		yyaccept = 89;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy745:
+		YYDEBUG(745, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_REQUIRE_ONCE);
+}
+yy746:
+		YYDEBUG(746, *YYCURSOR);
+		yyaccept = 90;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy747:
+		YYDEBUG(747, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_FUNC_C);
+}
+yy748:
+		YYDEBUG(748, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy751;
+		if (yych == 'l') goto yy751;
+		goto yy47;
+yy749:
+		YYDEBUG(749, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy752;
+		goto yy47;
+yy750:
+		YYDEBUG(750, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'T') goto yy727;
+		if (yych == 't') goto yy727;
+		goto yy85;
+yy751:
+		YYDEBUG(751, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy754;
+		if (yych == 'e') goto yy754;
+		goto yy47;
+yy752:
+		YYDEBUG(752, *YYCURSOR);
+		yyaccept = 91;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
+		}
+		if (yych == '\\') goto yy160;
+yy753:
+		YYDEBUG(753, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_NS_C);
+}
+yy754:
+		YYDEBUG(754, *YYCURSOR);
+		yyaccept = 4;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy755;
+		if (yych != 'r') goto yy47;
+yy755:
+		YYDEBUG(755, *YYCURSOR);
+		yyaccept = 92;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy46;
 		}
+		if (yych == '\\') goto yy160;
+yy756:
+		YYDEBUG(756, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
+	RETURN_TOKEN_WITH_IDENT(T_HALT_COMPILER);
+}
 	}
-yy683:
-	YYDEBUG(683, yych);
-	++YYCURSOR;
-yy684:
-	YYDEBUG(684, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
+/* *********************************** */
+yyc_ST_LOOKING_FOR_PROPERTY:
 	{
+		static const unsigned char yybm[] = {
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,  64,  64,   0,   0,  64,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			 64,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128,   0,   0,   0,   0,   0,   0, 
+			  0, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0, 128, 
+			  0, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0,   0, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+		};
+		YYDEBUG(757, *YYCURSOR);
+		YYFILL(4);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 64) {
+			goto yy761;
+		}
+		if (yych <= '?') {
+			if (yych <= '-') {
+				if (yych == '#') goto yy764;
+				if (yych >= '-') goto yy766;
+			} else {
+				if (yych == '/') goto yy767;
+				if (yych >= '?') goto yy768;
+			}
+		} else {
+			if (yych <= '_') {
+				if (yych <= '@') goto yy759;
+				if (yych <= 'Z') goto yy769;
+				if (yych >= '_') goto yy769;
+			} else {
+				if (yych <= '`') goto yy759;
+				if (yych <= 'z') goto yy769;
+				if (yych >= 0x80) goto yy769;
+			}
+		}
+yy759:
+		YYDEBUG(759, *YYCURSOR);
+		++YYCURSOR;
+yy760:
+		YYDEBUG(760, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(0);
 	yy_pop_state();
 	goto restart;
 }
-yy685:
-	YYDEBUG(685, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_LOOKING_FOR_PROPERTY[0+yych] & 64) goto yy685;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy761:
+		YYDEBUG(761, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(762, *YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy761;
+		}
+		YYDEBUG(763, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	goto return_whitespace;
 }
-yy686:
-	YYDEBUG(686, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy764:
+		YYDEBUG(764, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(765, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	while (YYCURSOR < YYLIMIT) {
 		switch (*YYCURSOR++) {
 			case '\r':
@@ -8034,50 +8190,55 @@
 	yyleng = YYCURSOR - SCNG(yy_text);
 	RETURN_OR_SKIP_TOKEN(T_COMMENT);
 }
-yy687:
-	YYDEBUG(687, yych);
-	yych = *++YYCURSOR;
-	if (yych == '>') goto yy691;
-	goto yy684;
-yy688:
-	YYDEBUG(688, yych);
-	yych = *++YYCURSOR;
-	if (yych == '*') goto yy692;
-	if (yych == '/') goto yy686;
-	goto yy684;
-yy689:
-	YYDEBUG(689, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '-') goto yy694;
-	goto yy684;
-yy690:
-	YYDEBUG(690, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_LOOKING_FOR_PROPERTY[0+yych] & 128) goto yy690;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy766:
+		YYDEBUG(766, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy772;
+		goto yy760;
+yy767:
+		YYDEBUG(767, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '*') goto yy774;
+		if (yych == '/') goto yy764;
+		goto yy760;
+yy768:
+		YYDEBUG(768, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '-') goto yy776;
+		goto yy760;
+yy769:
+		YYDEBUG(769, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(770, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy769;
+		}
+		YYDEBUG(771, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yy_pop_state();
 	RETURN_TOKEN_WITH_STR(T_STRING, 0);
 }
-yy691:
-	YYDEBUG(691, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy772:
+		YYDEBUG(772, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(773, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_OBJECT_OPERATOR);
 }
-yy692:
-	YYDEBUG(692, yych);
-	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '*') goto yy696;
-yy693:
-	YYDEBUG(693, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy774:
+		YYDEBUG(774, *YYCURSOR);
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '*') goto yy778;
+yy775:
+		YYDEBUG(775, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	int doc_com;
 
 	if (yyleng > 2) {
@@ -8112,64 +8273,106 @@
 
 	RETURN_OR_SKIP_TOKEN(T_COMMENT);
 }
-yy694:
-	YYDEBUG(694, yych);
-	yych = *++YYCURSOR;
-	if (yych == '>') goto yy697;
-yy695:
-	YYDEBUG(695, yych);
-	YYCURSOR = YYMARKER;
-	if (yyaccept == 0) goto yy684;
-	else goto yy693;
-yy696:
-	YYDEBUG(696, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '\f') {
-		if (yych <= 0x08) goto yy695;
-		if (yych <= '\n') goto yy698;
-		goto yy695;
-	} else {
-		if (yych <= '\r') goto yy698;
-		if (yych == ' ') goto yy698;
-		goto yy695;
-	}
-yy697:
-	YYDEBUG(697, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy776:
+		YYDEBUG(776, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy779;
+yy777:
+		YYDEBUG(777, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		if (yyaccept == 0) {
+			goto yy760;
+		} else {
+			goto yy775;
+		}
+yy778:
+		YYDEBUG(778, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\f') {
+			if (yych <= 0x08) goto yy777;
+			if (yych <= '\n') goto yy781;
+			goto yy777;
+		} else {
+			if (yych <= '\r') goto yy781;
+			if (yych == ' ') goto yy781;
+			goto yy777;
+		}
+yy779:
+		YYDEBUG(779, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(780, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN(T_NULLSAFE_OBJECT_OPERATOR);
 }
-yy698:
-	YYDEBUG(698, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\f') {
-		if (yych <= 0x08) goto yy693;
-		if (yych <= '\n') goto yy698;
-		goto yy693;
-	} else {
-		if (yych <= '\r') goto yy698;
-		if (yych == ' ') goto yy698;
-		goto yy693;
+yy781:
+		YYDEBUG(781, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(782, *YYCURSOR);
+		if (yych <= '\f') {
+			if (yych <= 0x08) goto yy775;
+			if (yych <= '\n') goto yy781;
+			goto yy775;
+		} else {
+			if (yych <= '\r') goto yy781;
+			if (yych == ' ') goto yy781;
+			goto yy775;
+		}
 	}
 /* *********************************** */
 yyc_ST_BACKQUOTE:
-	YYFILL(2);
-	yych = *YYCURSOR;
-	YYDEBUG(699, yych);
-	if (yych <= '_') {
-		if (yych == '$') goto yy701;
-	} else {
-		if (yych <= '`') goto yy702;
-		if (yych == '{') goto yy703;
-	}
-	++YYCURSOR;
-yy700:
-	YYDEBUG(700, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
 	{
+		static const unsigned char yybm[] = {
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128,   0,   0,   0,   0,   0,   0, 
+			  0, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0, 128, 
+			  0, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0,   0, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+		};
+		YYDEBUG(783, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yych <= '_') {
+			if (yych == '$') goto yy787;
+		} else {
+			if (yych <= '`') goto yy788;
+			if (yych == '{') goto yy790;
+		}
+		YYDEBUG(785, *YYCURSOR);
+		++YYCURSOR;
+yy786:
+		YYDEBUG(786, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	if (YYCURSOR > YYLIMIT) {
 		RETURN_END_TOKEN;
 	}
@@ -8213,162 +8416,208 @@
 		RETURN_TOKEN(T_ERROR);
 	}
 }
-yy701:
-	YYDEBUG(701, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy700;
-		if (yych <= 'Z') goto yy704;
-		if (yych <= '^') goto yy700;
-		goto yy704;
-	} else {
-		if (yych <= 'z') {
-			if (yych <= '`') goto yy700;
-			goto yy704;
-		} else {
-			if (yych <= '{') goto yy706;
-			if (yych <= 0x7F) goto yy700;
-			goto yy704;
+yy787:
+		YYDEBUG(787, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy786;
+			if (yych <= 'Z') goto yy791;
+			if (yych <= '^') goto yy786;
+			goto yy791;
+		} else {
+			if (yych <= 'z') {
+				if (yych <= '`') goto yy786;
+				goto yy791;
+			} else {
+				if (yych <= '{') goto yy794;
+				if (yych <= 0x7F) goto yy786;
+				goto yy791;
+			}
 		}
-	}
-yy702:
-	YYDEBUG(702, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy788:
+		YYDEBUG(788, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(789, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	BEGIN(ST_IN_SCRIPTING);
 	RETURN_TOKEN('`');
 }
-yy703:
-	YYDEBUG(703, yych);
-	yych = *++YYCURSOR;
-	if (yych == '$') goto yy707;
-	goto yy700;
-yy704:
-	YYDEBUG(704, yych);
-	YYMARKER = ++YYCURSOR;
-	YYFILL(4);
-	yych = *YYCURSOR;
-	if (yybm_ST_BACKQUOTE[0+yych] & 128) goto yy704;
-	if (yych <= '>') {
-		if (yych == '-') goto yy708;
-	} else {
-		if (yych <= '?') goto yy710;
-		if (yych <= '@') goto yy705;
-		if (yych <= '[') goto yy711;
-	}
-yy705:
-	YYDEBUG(705, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy790:
+		YYDEBUG(790, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '$') goto yy796;
+		goto yy786;
+yy791:
+		YYDEBUG(791, *YYCURSOR);
+		YYMARKER = ++YYCURSOR;
+		YYFILL(4);
+		yych = *YYCURSOR;
+		YYDEBUG(792, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy791;
+		}
+		if (yych <= '>') {
+			if (yych == '-') goto yy798;
+		} else {
+			if (yych <= '?') goto yy800;
+			if (yych <= '@') goto yy793;
+			if (yych <= '[') goto yy801;
+		}
+yy793:
+		YYDEBUG(793, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy706:
-	YYDEBUG(706, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy794:
+		YYDEBUG(794, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(795, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yy_push_state(ST_LOOKING_FOR_VARNAME);
 	enter_nesting('{');
 	RETURN_TOKEN(T_DOLLAR_OPEN_CURLY_BRACES);
 }
-yy707:
-	YYDEBUG(707, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy796:
+		YYDEBUG(796, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(797, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yy_push_state(ST_IN_SCRIPTING);
 	yyless(1);
 	enter_nesting('{');
 	RETURN_TOKEN(T_CURLY_OPEN);
 }
-yy708:
-	YYDEBUG(708, yych);
-	yych = *++YYCURSOR;
-	if (yych == '>') goto yy712;
-yy709:
-	YYDEBUG(709, yych);
-	YYCURSOR = YYMARKER;
-	goto yy705;
-yy710:
-	YYDEBUG(710, yych);
-	yych = *++YYCURSOR;
-	if (yych == '-') goto yy713;
-	goto yy709;
-yy711:
-	YYDEBUG(711, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy798:
+		YYDEBUG(798, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy803;
+yy799:
+		YYDEBUG(799, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		goto yy793;
+yy800:
+		YYDEBUG(800, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '-') goto yy804;
+		goto yy799;
+yy801:
+		YYDEBUG(801, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(802, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(yyleng - 1);
 	yy_push_state(ST_VAR_OFFSET);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy712:
-	YYDEBUG(712, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy709;
-		if (yych <= 'Z') goto yy714;
-		if (yych <= '^') goto yy709;
-		goto yy714;
-	} else {
-		if (yych <= '`') goto yy709;
-		if (yych <= 'z') goto yy714;
-		if (yych <= 0x7F) goto yy709;
-		goto yy714;
-	}
-yy713:
-	YYDEBUG(713, yych);
-	yych = *++YYCURSOR;
-	if (yych == '>') goto yy715;
-	goto yy709;
-yy714:
-	YYDEBUG(714, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy803:
+		YYDEBUG(803, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy799;
+			if (yych <= 'Z') goto yy805;
+			if (yych <= '^') goto yy799;
+			goto yy805;
+		} else {
+			if (yych <= '`') goto yy799;
+			if (yych <= 'z') goto yy805;
+			if (yych <= 0x7F) goto yy799;
+			goto yy805;
+		}
+yy804:
+		YYDEBUG(804, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy807;
+		goto yy799;
+yy805:
+		YYDEBUG(805, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(806, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(yyleng - 3);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy715:
-	YYDEBUG(715, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy709;
-		if (yych <= 'Z') goto yy716;
-		if (yych <= '^') goto yy709;
-	} else {
-		if (yych <= '`') goto yy709;
-		if (yych <= 'z') goto yy716;
-		if (yych <= 0x7F) goto yy709;
-	}
-yy716:
-	YYDEBUG(716, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy807:
+		YYDEBUG(807, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy799;
+			if (yych <= 'Z') goto yy808;
+			if (yych <= '^') goto yy799;
+		} else {
+			if (yych <= '`') goto yy799;
+			if (yych <= 'z') goto yy808;
+			if (yych <= 0x7F) goto yy799;
+		}
+yy808:
+		YYDEBUG(808, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(809, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(yyleng - 4);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
+	}
 /* *********************************** */
 yyc_ST_DOUBLE_QUOTES:
-	YYFILL(2);
-	yych = *YYCURSOR;
-	YYDEBUG(717, yych);
-	if (yych <= '#') {
-		if (yych == '"') goto yy719;
-	} else {
-		if (yych <= '$') goto yy720;
-		if (yych == '{') goto yy721;
-	}
-	++YYCURSOR;
-yy718:
-	YYDEBUG(718, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
 	{
+		static const unsigned char yybm[] = {
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128,   0,   0,   0,   0,   0,   0, 
+			  0, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0, 128, 
+			  0, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0,   0, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+		};
+		YYDEBUG(810, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yych <= '#') {
+			if (yych == '"') goto yy814;
+		} else {
+			if (yych <= '$') goto yy816;
+			if (yych == '{') goto yy817;
+		}
+		YYDEBUG(812, *YYCURSOR);
+		++YYCURSOR;
+yy813:
+		YYDEBUG(813, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	if (GET_DOUBLE_QUOTES_SCANNED_LENGTH()) {
 		YYCURSOR += GET_DOUBLE_QUOTES_SCANNED_LENGTH() - 1;
 		SET_DOUBLE_QUOTES_SCANNED_LENGTH(0);
@@ -8420,158 +8669,204 @@
 		RETURN_TOKEN(T_ERROR);
 	}
 }
-yy719:
-	YYDEBUG(719, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy814:
+		YYDEBUG(814, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(815, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	BEGIN(ST_IN_SCRIPTING);
 	RETURN_TOKEN('"');
 }
-yy720:
-	YYDEBUG(720, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy718;
-		if (yych <= 'Z') goto yy722;
-		if (yych <= '^') goto yy718;
-		goto yy722;
-	} else {
-		if (yych <= 'z') {
-			if (yych <= '`') goto yy718;
-			goto yy722;
-		} else {
-			if (yych <= '{') goto yy724;
-			if (yych <= 0x7F) goto yy718;
-			goto yy722;
-		}
-	}
-yy721:
-	YYDEBUG(721, yych);
-	yych = *++YYCURSOR;
-	if (yych == '$') goto yy725;
-	goto yy718;
-yy722:
-	YYDEBUG(722, yych);
-	YYMARKER = ++YYCURSOR;
-	YYFILL(4);
-	yych = *YYCURSOR;
-	if (yybm_ST_DOUBLE_QUOTES[0+yych] & 128) goto yy722;
-	if (yych <= '>') {
-		if (yych == '-') goto yy726;
-	} else {
-		if (yych <= '?') goto yy728;
-		if (yych <= '@') goto yy723;
-		if (yych <= '[') goto yy729;
-	}
-yy723:
-	YYDEBUG(723, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy816:
+		YYDEBUG(816, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy813;
+			if (yych <= 'Z') goto yy818;
+			if (yych <= '^') goto yy813;
+			goto yy818;
+		} else {
+			if (yych <= 'z') {
+				if (yych <= '`') goto yy813;
+				goto yy818;
+			} else {
+				if (yych <= '{') goto yy821;
+				if (yych <= 0x7F) goto yy813;
+				goto yy818;
+			}
+		}
+yy817:
+		YYDEBUG(817, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '$') goto yy823;
+		goto yy813;
+yy818:
+		YYDEBUG(818, *YYCURSOR);
+		YYMARKER = ++YYCURSOR;
+		YYFILL(4);
+		yych = *YYCURSOR;
+		YYDEBUG(819, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy818;
+		}
+		if (yych <= '>') {
+			if (yych == '-') goto yy825;
+		} else {
+			if (yych <= '?') goto yy827;
+			if (yych <= '@') goto yy820;
+			if (yych <= '[') goto yy828;
+		}
+yy820:
+		YYDEBUG(820, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy724:
-	YYDEBUG(724, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy821:
+		YYDEBUG(821, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(822, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yy_push_state(ST_LOOKING_FOR_VARNAME);
 	enter_nesting('{');
 	RETURN_TOKEN(T_DOLLAR_OPEN_CURLY_BRACES);
 }
-yy725:
-	YYDEBUG(725, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy823:
+		YYDEBUG(823, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(824, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yy_push_state(ST_IN_SCRIPTING);
 	yyless(1);
 	enter_nesting('{');
 	RETURN_TOKEN(T_CURLY_OPEN);
 }
-yy726:
-	YYDEBUG(726, yych);
-	yych = *++YYCURSOR;
-	if (yych == '>') goto yy730;
-yy727:
-	YYDEBUG(727, yych);
-	YYCURSOR = YYMARKER;
-	goto yy723;
-yy728:
-	YYDEBUG(728, yych);
-	yych = *++YYCURSOR;
-	if (yych == '-') goto yy731;
-	goto yy727;
-yy729:
-	YYDEBUG(729, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy825:
+		YYDEBUG(825, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy830;
+yy826:
+		YYDEBUG(826, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		goto yy820;
+yy827:
+		YYDEBUG(827, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '-') goto yy831;
+		goto yy826;
+yy828:
+		YYDEBUG(828, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(829, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(yyleng - 1);
 	yy_push_state(ST_VAR_OFFSET);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy730:
-	YYDEBUG(730, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy727;
-		if (yych <= 'Z') goto yy732;
-		if (yych <= '^') goto yy727;
-		goto yy732;
-	} else {
-		if (yych <= '`') goto yy727;
-		if (yych <= 'z') goto yy732;
-		if (yych <= 0x7F) goto yy727;
-		goto yy732;
-	}
-yy731:
-	YYDEBUG(731, yych);
-	yych = *++YYCURSOR;
-	if (yych == '>') goto yy733;
-	goto yy727;
-yy732:
-	YYDEBUG(732, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy830:
+		YYDEBUG(830, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy826;
+			if (yych <= 'Z') goto yy832;
+			if (yych <= '^') goto yy826;
+			goto yy832;
+		} else {
+			if (yych <= '`') goto yy826;
+			if (yych <= 'z') goto yy832;
+			if (yych <= 0x7F) goto yy826;
+			goto yy832;
+		}
+yy831:
+		YYDEBUG(831, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy834;
+		goto yy826;
+yy832:
+		YYDEBUG(832, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(833, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(yyleng - 3);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy733:
-	YYDEBUG(733, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy727;
-		if (yych <= 'Z') goto yy734;
-		if (yych <= '^') goto yy727;
-	} else {
-		if (yych <= '`') goto yy727;
-		if (yych <= 'z') goto yy734;
-		if (yych <= 0x7F) goto yy727;
-	}
-yy734:
-	YYDEBUG(734, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy834:
+		YYDEBUG(834, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy826;
+			if (yych <= 'Z') goto yy835;
+			if (yych <= '^') goto yy826;
+		} else {
+			if (yych <= '`') goto yy826;
+			if (yych <= 'z') goto yy835;
+			if (yych <= 0x7F) goto yy826;
+		}
+yy835:
+		YYDEBUG(835, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(836, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(yyleng - 4);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
+	}
 /* *********************************** */
 yyc_ST_HEREDOC:
-	YYFILL(2);
-	yych = *YYCURSOR;
-	YYDEBUG(735, yych);
-	if (yych == '$') goto yy737;
-	if (yych == '{') goto yy738;
-	++YYCURSOR;
-yy736:
-	YYDEBUG(736, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
 	{
+		static const unsigned char yybm[] = {
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128,   0,   0,   0,   0,   0,   0, 
+			  0, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0, 128, 
+			  0, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0,   0, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+		};
+		YYDEBUG(837, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yych == '$') goto yy841;
+		if (yych == '{') goto yy842;
+		YYDEBUG(839, *YYCURSOR);
+		++YYCURSOR;
+yy840:
+		YYDEBUG(840, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	zend_heredoc_label *heredoc_label = zend_ptr_stack_top(&SCNG(heredoc_label_stack));
 	int newline = 0, indentation = 0, spacing = 0;
 
@@ -8693,335 +8988,420 @@
 
 	RETURN_TOKEN_WITH_VAL(T_ENCAPSED_AND_WHITESPACE);
 }
-yy737:
-	YYDEBUG(737, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy736;
-		if (yych <= 'Z') goto yy739;
-		if (yych <= '^') goto yy736;
-		goto yy739;
-	} else {
-		if (yych <= 'z') {
-			if (yych <= '`') goto yy736;
-			goto yy739;
-		} else {
-			if (yych <= '{') goto yy741;
-			if (yych <= 0x7F) goto yy736;
-			goto yy739;
-		}
-	}
-yy738:
-	YYDEBUG(738, yych);
-	yych = *++YYCURSOR;
-	if (yych == '$') goto yy742;
-	goto yy736;
-yy739:
-	YYDEBUG(739, yych);
-	YYMARKER = ++YYCURSOR;
-	YYFILL(4);
-	yych = *YYCURSOR;
-	if (yybm_ST_HEREDOC[0+yych] & 128) goto yy739;
-	if (yych <= '>') {
-		if (yych == '-') goto yy743;
-	} else {
-		if (yych <= '?') goto yy745;
-		if (yych <= '@') goto yy740;
-		if (yych <= '[') goto yy746;
-	}
-yy740:
-	YYDEBUG(740, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy841:
+		YYDEBUG(841, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy840;
+			if (yych <= 'Z') goto yy843;
+			if (yych <= '^') goto yy840;
+			goto yy843;
+		} else {
+			if (yych <= 'z') {
+				if (yych <= '`') goto yy840;
+				goto yy843;
+			} else {
+				if (yych <= '{') goto yy846;
+				if (yych <= 0x7F) goto yy840;
+				goto yy843;
+			}
+		}
+yy842:
+		YYDEBUG(842, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '$') goto yy848;
+		goto yy840;
+yy843:
+		YYDEBUG(843, *YYCURSOR);
+		YYMARKER = ++YYCURSOR;
+		YYFILL(4);
+		yych = *YYCURSOR;
+		YYDEBUG(844, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy843;
+		}
+		if (yych <= '>') {
+			if (yych == '-') goto yy850;
+		} else {
+			if (yych <= '?') goto yy852;
+			if (yych <= '@') goto yy845;
+			if (yych <= '[') goto yy853;
+		}
+yy845:
+		YYDEBUG(845, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy741:
-	YYDEBUG(741, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy846:
+		YYDEBUG(846, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(847, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yy_push_state(ST_LOOKING_FOR_VARNAME);
 	enter_nesting('{');
 	RETURN_TOKEN(T_DOLLAR_OPEN_CURLY_BRACES);
 }
-yy742:
-	YYDEBUG(742, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy848:
+		YYDEBUG(848, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(849, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yy_push_state(ST_IN_SCRIPTING);
 	yyless(1);
 	enter_nesting('{');
 	RETURN_TOKEN(T_CURLY_OPEN);
 }
-yy743:
-	YYDEBUG(743, yych);
-	yych = *++YYCURSOR;
-	if (yych == '>') goto yy747;
-yy744:
-	YYDEBUG(744, yych);
-	YYCURSOR = YYMARKER;
-	goto yy740;
-yy745:
-	YYDEBUG(745, yych);
-	yych = *++YYCURSOR;
-	if (yych == '-') goto yy748;
-	goto yy744;
-yy746:
-	YYDEBUG(746, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy850:
+		YYDEBUG(850, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy855;
+yy851:
+		YYDEBUG(851, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		goto yy845;
+yy852:
+		YYDEBUG(852, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '-') goto yy856;
+		goto yy851;
+yy853:
+		YYDEBUG(853, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(854, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(yyleng - 1);
 	yy_push_state(ST_VAR_OFFSET);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy747:
-	YYDEBUG(747, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy744;
-		if (yych <= 'Z') goto yy749;
-		if (yych <= '^') goto yy744;
-		goto yy749;
-	} else {
-		if (yych <= '`') goto yy744;
-		if (yych <= 'z') goto yy749;
-		if (yych <= 0x7F) goto yy744;
-		goto yy749;
-	}
-yy748:
-	YYDEBUG(748, yych);
-	yych = *++YYCURSOR;
-	if (yych == '>') goto yy750;
-	goto yy744;
-yy749:
-	YYDEBUG(749, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy855:
+		YYDEBUG(855, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy851;
+			if (yych <= 'Z') goto yy857;
+			if (yych <= '^') goto yy851;
+			goto yy857;
+		} else {
+			if (yych <= '`') goto yy851;
+			if (yych <= 'z') goto yy857;
+			if (yych <= 0x7F) goto yy851;
+			goto yy857;
+		}
+yy856:
+		YYDEBUG(856, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '>') goto yy859;
+		goto yy851;
+yy857:
+		YYDEBUG(857, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(858, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(yyleng - 3);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy750:
-	YYDEBUG(750, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy744;
-		if (yych <= 'Z') goto yy751;
-		if (yych <= '^') goto yy744;
-	} else {
-		if (yych <= '`') goto yy744;
-		if (yych <= 'z') goto yy751;
-		if (yych <= 0x7F) goto yy744;
-	}
-yy751:
-	YYDEBUG(751, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy859:
+		YYDEBUG(859, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy851;
+			if (yych <= 'Z') goto yy860;
+			if (yych <= '^') goto yy851;
+		} else {
+			if (yych <= '`') goto yy851;
+			if (yych <= 'z') goto yy860;
+			if (yych <= 0x7F) goto yy851;
+		}
+yy860:
+		YYDEBUG(860, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(861, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(yyleng - 4);
 	yy_push_state(ST_LOOKING_FOR_PROPERTY);
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
+	}
 /* *********************************** */
 yyc_ST_LOOKING_FOR_VARNAME:
-	YYFILL(2);
-	yych = *YYCURSOR;
-	YYDEBUG(752, yych);
-	if (yych <= '_') {
-		if (yych <= '@') goto yy753;
-		if (yych <= 'Z') goto yy755;
-		if (yych >= '_') goto yy755;
-	} else {
-		if (yych <= '`') goto yy753;
-		if (yych <= 'z') goto yy755;
-		if (yych >= 0x80) goto yy755;
-	}
-yy753:
-	YYDEBUG(753, yych);
-	++YYCURSOR;
-yy754:
-	YYDEBUG(754, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
 	{
+		static const unsigned char yybm[] = {
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128,   0,   0,   0,   0,   0,   0, 
+			  0, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0, 128, 
+			  0, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128,   0,   0,   0,   0,   0, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+		};
+		YYDEBUG(862, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy864;
+			if (yych <= 'Z') goto yy866;
+			if (yych >= '_') goto yy866;
+		} else {
+			if (yych <= '`') goto yy864;
+			if (yych <= 'z') goto yy866;
+			if (yych >= 0x80) goto yy866;
+		}
+yy864:
+		YYDEBUG(864, *YYCURSOR);
+		++YYCURSOR;
+yy865:
+		YYDEBUG(865, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(0);
 	yy_pop_state();
 	yy_push_state(ST_IN_SCRIPTING);
 	goto restart;
 }
-yy755:
-	YYDEBUG(755, yych);
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '_') {
-		if (yych <= '@') {
-			if (yych <= '/') goto yy754;
-			if (yych <= '9') goto yy757;
-			goto yy754;
-		} else {
-			if (yych <= '[') goto yy757;
-			if (yych <= '^') goto yy754;
-			goto yy757;
-		}
-	} else {
-		if (yych <= '|') {
-			if (yych <= '`') goto yy754;
-			if (yych <= 'z') goto yy757;
-			goto yy754;
-		} else {
-			if (yych <= '}') goto yy757;
-			if (yych <= 0x7F) goto yy754;
-			goto yy757;
+yy866:
+		YYDEBUG(866, *YYCURSOR);
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '_') {
+			if (yych <= '@') {
+				if (yych <= '/') goto yy865;
+				if (yych <= '9') goto yy868;
+				goto yy865;
+			} else {
+				if (yych <= '[') goto yy868;
+				if (yych <= '^') goto yy865;
+				goto yy868;
+			}
+		} else {
+			if (yych <= '|') {
+				if (yych <= '`') goto yy865;
+				if (yych <= 'z') goto yy868;
+				goto yy865;
+			} else {
+				if (yych <= '}') goto yy868;
+				if (yych <= 0x7F) goto yy865;
+				goto yy868;
+			}
 		}
-	}
-yy756:
-	YYDEBUG(756, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-yy757:
-	YYDEBUG(757, yych);
-	if (yybm_ST_LOOKING_FOR_VARNAME[0+yych] & 128) goto yy756;
-	if (yych <= '@') goto yy758;
-	if (yych <= '[') goto yy759;
-	if (yych == '}') goto yy759;
-yy758:
-	YYDEBUG(758, yych);
-	YYCURSOR = YYMARKER;
-	goto yy754;
-yy759:
-	YYDEBUG(759, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy867:
+		YYDEBUG(867, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+yy868:
+		YYDEBUG(868, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy867;
+		}
+		if (yych <= '@') goto yy869;
+		if (yych <= '[') goto yy870;
+		if (yych == '}') goto yy870;
+yy869:
+		YYDEBUG(869, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		goto yy865;
+yy870:
+		YYDEBUG(870, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(871, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(yyleng - 1);
 	yy_pop_state();
 	yy_push_state(ST_IN_SCRIPTING);
 	RETURN_TOKEN_WITH_STR(T_STRING_VARNAME, 0);
 }
+	}
 /* *********************************** */
 yyc_ST_VAR_OFFSET:
-	YYFILL(2);
-	yych = *YYCURSOR;
-	YYDEBUG(760, yych);
-	if (yych <= '0') {
-		if (yych <= ' ') {
-			if (yych <= '\f') {
-				if (yych <= 0x08) goto yy761;
-				if (yych <= '\n') goto yy762;
+	{
+		static const unsigned char yybm[] = {
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			248, 248, 216, 216, 216, 216, 216, 216, 
+			152, 152,   0,   0,   0,   0,   0,   0, 
+			  0, 144, 144, 144, 144, 144, 144,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,   0,   0,   0,   0,  16, 
+			  0, 144, 144, 144, 144, 144, 144,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,   0,   0,   0,   0,   0, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+			 16,  16,  16,  16,  16,  16,  16,  16, 
+		};
+		YYDEBUG(872, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yych <= '0') {
+			if (yych <= ' ') {
+				if (yych <= '\f') {
+					if (yych <= 0x08) goto yy874;
+					if (yych <= '\n') goto yy876;
+				} else {
+					if (yych <= '\r') goto yy876;
+					if (yych >= ' ') goto yy876;
+				}
 			} else {
-				if (yych <= '\r') goto yy762;
-				if (yych >= ' ') goto yy762;
-			}
-		} else {
-			if (yych <= '$') {
-				if (yych <= '"') goto yy763;
-				if (yych <= '#') goto yy762;
-				goto yy765;
-			} else {
-				if (yych == '\'') goto yy762;
-				if (yych <= '/') goto yy763;
-				goto yy766;
-			}
-		}
-	} else {
-		if (yych <= ']') {
-			if (yych <= 'Z') {
-				if (yych <= '9') goto yy768;
-				if (yych <= '@') goto yy763;
-				goto yy769;
-			} else {
-				if (yych <= '[') goto yy763;
-				if (yych <= '\\') goto yy762;
-				goto yy770;
+				if (yych <= '$') {
+					if (yych <= '"') goto yy878;
+					if (yych <= '#') goto yy876;
+					goto yy880;
+				} else {
+					if (yych == '\'') goto yy876;
+					if (yych <= '/') goto yy878;
+					goto yy881;
+				}
 			}
 		} else {
-			if (yych <= '`') {
-				if (yych == '_') goto yy769;
-				goto yy763;
+			if (yych <= ']') {
+				if (yych <= 'Z') {
+					if (yych <= '9') goto yy883;
+					if (yych <= '@') goto yy878;
+					goto yy885;
+				} else {
+					if (yych <= '[') goto yy878;
+					if (yych <= '\\') goto yy876;
+					goto yy888;
+				}
 			} else {
-				if (yych <= 'z') goto yy769;
-				if (yych <= '~') goto yy763;
-				if (yych >= 0x80) goto yy769;
+				if (yych <= '`') {
+					if (yych == '_') goto yy885;
+					goto yy878;
+				} else {
+					if (yych <= 'z') goto yy885;
+					if (yych <= '~') goto yy878;
+					if (yych >= 0x80) goto yy885;
+				}
 			}
 		}
-	}
-yy761:
-	YYDEBUG(761, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy874:
+		YYDEBUG(874, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(875, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	if (YYCURSOR > YYLIMIT) {
 		RETURN_END_TOKEN;
 	}
 
 	RETURN_TOKEN(T_BAD_CHARACTER);
 }
-yy762:
-	YYDEBUG(762, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy876:
+		YYDEBUG(876, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(877, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	/* Invalid rule to return a more explicit parse error with proper line number */
 	yyless(0);
 	yy_pop_state();
 	ZVAL_NULL(zendlval);
 	RETURN_TOKEN_WITH_VAL(T_ENCAPSED_AND_WHITESPACE);
 }
-yy763:
-	YYDEBUG(763, yych);
-	++YYCURSOR;
-yy764:
-	YYDEBUG(764, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy878:
+		YYDEBUG(878, *YYCURSOR);
+		++YYCURSOR;
+yy879:
+		YYDEBUG(879, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	/* Only '[' or '-' can be valid, but returning other tokens will allow a more explicit parse error */
 	RETURN_TOKEN(yytext[0]);
 }
-yy765:
-	YYDEBUG(765, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '_') {
-		if (yych <= '@') goto yy764;
-		if (yych <= 'Z') goto yy771;
-		if (yych <= '^') goto yy764;
-		goto yy771;
-	} else {
-		if (yych <= '`') goto yy764;
-		if (yych <= 'z') goto yy771;
-		if (yych <= 0x7F) goto yy764;
-		goto yy771;
-	}
-yy766:
-	YYDEBUG(766, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'X') {
-		if (yych <= 'B') {
-			if (yych <= '/') goto yy767;
-			if (yych <= '9') goto yy773;
-			if (yych >= 'B') goto yy775;
-		} else {
-			if (yych == 'O') goto yy777;
-			if (yych >= 'X') goto yy778;
-		}
-	} else {
-		if (yych <= 'b') {
-			if (yych == '_') goto yy779;
-			if (yych >= 'b') goto yy775;
+yy880:
+		YYDEBUG(880, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '_') {
+			if (yych <= '@') goto yy879;
+			if (yych <= 'Z') goto yy890;
+			if (yych <= '^') goto yy879;
+			goto yy890;
+		} else {
+			if (yych <= '`') goto yy879;
+			if (yych <= 'z') goto yy890;
+			if (yych <= 0x7F) goto yy879;
+			goto yy890;
+		}
+yy881:
+		YYDEBUG(881, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'X') {
+			if (yych <= 'B') {
+				if (yych <= '/') goto yy882;
+				if (yych <= '9') goto yy893;
+				if (yych >= 'B') goto yy896;
+			} else {
+				if (yych == 'O') goto yy898;
+				if (yych >= 'X') goto yy899;
+			}
 		} else {
-			if (yych <= 'o') {
-				if (yych >= 'o') goto yy777;
+			if (yych <= 'b') {
+				if (yych == '_') goto yy900;
+				if (yych >= 'b') goto yy896;
 			} else {
-				if (yych == 'x') goto yy778;
+				if (yych <= 'o') {
+					if (yych >= 'o') goto yy898;
+				} else {
+					if (yych == 'x') goto yy899;
+				}
 			}
 		}
-	}
-yy767:
-	YYDEBUG(767, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Offset could be treated as a long */
+yy882:
+		YYDEBUG(882, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* 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)) {
 		char *end;
 		errno = 0;
@@ -9036,72 +9416,82 @@
 	}
 	RETURN_TOKEN_WITH_VAL(T_NUM_STRING);
 }
-yy768:
-	YYDEBUG(768, yych);
-	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VAR_OFFSET[0+yych] & 8) goto yy768;
-	if (yych == '_') goto yy779;
-	goto yy767;
-yy769:
-	YYDEBUG(769, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VAR_OFFSET[0+yych] & 16) goto yy769;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy883:
+		YYDEBUG(883, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(884, *YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy883;
+		}
+		if (yych == '_') goto yy900;
+		goto yy882;
+yy885:
+		YYDEBUG(885, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(886, *YYCURSOR);
+		if (yybm[0+yych] & 16) {
+			goto yy885;
+		}
+		YYDEBUG(887, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_STR(T_STRING, 0);
 }
-yy770:
-	YYDEBUG(770, yych);
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy888:
+		YYDEBUG(888, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(889, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yy_pop_state();
 	RETURN_TOKEN(']');
 }
-yy771:
-	YYDEBUG(771, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '^') {
-		if (yych <= '9') {
-			if (yych >= '0') goto yy771;
-		} else {
-			if (yych <= '@') goto yy772;
-			if (yych <= 'Z') goto yy771;
-		}
-	} else {
-		if (yych <= '`') {
-			if (yych <= '_') goto yy771;
+yy890:
+		YYDEBUG(890, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(891, *YYCURSOR);
+		if (yych <= '^') {
+			if (yych <= '9') {
+				if (yych >= '0') goto yy890;
+			} else {
+				if (yych <= '@') goto yy892;
+				if (yych <= 'Z') goto yy890;
+			}
 		} else {
-			if (yych <= 'z') goto yy771;
-			if (yych >= 0x80) goto yy771;
+			if (yych <= '`') {
+				if (yych <= '_') goto yy890;
+			} else {
+				if (yych <= 'z') goto yy890;
+				if (yych >= 0x80) goto yy890;
+			}
 		}
-	}
-yy772:
-	YYDEBUG(772, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy892:
+		YYDEBUG(892, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	RETURN_TOKEN_WITH_STR(T_VARIABLE, 1);
 }
-yy773:
-	YYDEBUG(773, yych);
-	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '/') goto yy774;
-	if (yych <= '9') goto yy773;
-	if (yych == '_') goto yy779;
-yy774:
-	YYDEBUG(774, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{ /* Offset must be treated as a string */
+yy893:
+		YYDEBUG(893, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(894, *YYCURSOR);
+		if (yych <= '/') goto yy895;
+		if (yych <= '9') goto yy893;
+		if (yych == '_') goto yy900;
+yy895:
+		YYDEBUG(895, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{ /* Offset must be treated as a string */
 	if (yyleng == 1) {
 		ZVAL_INTERNED_STR(zendlval, ZSTR_CHAR((zend_uchar)*(yytext)));
 	} else {
@@ -9109,107 +9499,169 @@
 	}
 	RETURN_TOKEN_WITH_VAL(T_NUM_STRING);
 }
-yy775:
-	YYDEBUG(775, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VAR_OFFSET[0+yych] & 32) goto yy780;
-yy776:
-	YYDEBUG(776, yych);
-	YYCURSOR = YYMARKER;
-	if (yyaccept == 0) goto yy767;
-	else goto yy774;
-yy777:
-	YYDEBUG(777, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VAR_OFFSET[0+yych] & 64) goto yy781;
-	goto yy776;
-yy778:
-	YYDEBUG(778, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VAR_OFFSET[0+yych] & 128) goto yy782;
-	goto yy776;
-yy779:
-	YYDEBUG(779, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '/') goto yy776;
-	if (yych <= '9') goto yy773;
-	goto yy776;
-yy780:
-	YYDEBUG(780, yych);
-	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VAR_OFFSET[0+yych] & 32) goto yy780;
-	if (yych == '_') goto yy775;
-	goto yy774;
-yy781:
-	YYDEBUG(781, yych);
-	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VAR_OFFSET[0+yych] & 64) goto yy781;
-	if (yych == '_') goto yy777;
-	goto yy774;
-yy782:
-	YYDEBUG(782, yych);
-	yyaccept = 1;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_ST_VAR_OFFSET[0+yych] & 128) goto yy782;
-	if (yych == '_') goto yy778;
-	goto yy774;
+yy896:
+		YYDEBUG(896, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 32) {
+			goto yy901;
+		}
+yy897:
+		YYDEBUG(897, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		if (yyaccept == 0) {
+			goto yy882;
+		} else {
+			goto yy895;
+		}
+yy898:
+		YYDEBUG(898, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 64) {
+			goto yy903;
+		}
+		goto yy897;
+yy899:
+		YYDEBUG(899, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 128) {
+			goto yy905;
+		}
+		goto yy897;
+yy900:
+		YYDEBUG(900, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych <= '/') goto yy897;
+		if (yych <= '9') goto yy893;
+		goto yy897;
+yy901:
+		YYDEBUG(901, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(902, *YYCURSOR);
+		if (yybm[0+yych] & 32) {
+			goto yy901;
+		}
+		if (yych == '_') goto yy896;
+		goto yy895;
+yy903:
+		YYDEBUG(903, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(904, *YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy903;
+		}
+		if (yych == '_') goto yy898;
+		goto yy895;
+yy905:
+		YYDEBUG(905, *YYCURSOR);
+		yyaccept = 1;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(906, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy905;
+		}
+		if (yych == '_') goto yy899;
+		goto yy895;
+	}
 /* *********************************** */
 yyc_SHEBANG:
-	YYFILL(2);
-	yych = *YYCURSOR;
-	YYDEBUG(783, yych);
-	if (yych == '#') goto yy785;
-	++YYCURSOR;
-yy784:
-	YYDEBUG(784, yych);
-	yyleng = YYCURSOR - SCNG(yy_text);
 	{
+		static const unsigned char yybm[] = {
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128,   0, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+		};
+		YYDEBUG(907, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yych == '#') goto yy911;
+		YYDEBUG(909, *YYCURSOR);
+		++YYCURSOR;
+yy910:
+		YYDEBUG(910, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	yyless(0);
 	BEGIN(INITIAL);
 	goto restart;
 }
-yy785:
-	YYDEBUG(785, yych);
-	yych = *++YYCURSOR;
-	if (yych != '!') goto yy784;
-yy786:
-	YYDEBUG(786, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_SHEBANG[0+yych] & 128) goto yy786;
-	++YYCURSOR;
-	yyleng = YYCURSOR - SCNG(yy_text);
-	{
+yy911:
+		YYDEBUG(911, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych != '!') goto yy910;
+yy912:
+		YYDEBUG(912, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(913, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy912;
+		}
+		YYDEBUG(914, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(915, *YYCURSOR);
+		yyleng = YYCURSOR - SCNG(yy_text);
+		{
 	CG(zend_lineno)++;
 	BEGIN(INITIAL);
 	goto restart;
 }
+	}
 /* *********************************** */
 yyc_INITIAL:
+	YYDEBUG(916, *YYCURSOR);
 	YYFILL(7);
 	yych = *YYCURSOR;
-	YYDEBUG(787, yych);
-	if (yych == '<') goto yy789;
+	if (yych == '<') goto yy920;
+	YYDEBUG(918, *YYCURSOR);
 	++YYCURSOR;
-yy788:
-	YYDEBUG(788, yych);
+yy919:
+	YYDEBUG(919, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{
 	if (YYCURSOR > YYLIMIT) {
@@ -9262,19 +9714,20 @@
 	HANDLE_NEWLINES(yytext, yyleng);
 	RETURN_TOKEN_WITH_VAL(T_INLINE_HTML);
 }
-yy789:
-	YYDEBUG(789, yych);
+yy920:
+	YYDEBUG(920, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych != '?') goto yy788;
+	if (yych != '?') goto yy919;
+	YYDEBUG(921, *YYCURSOR);
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych <= 'O') {
-		if (yych == '=') goto yy791;
+		if (yych == '=') goto yy923;
 	} else {
-		if (yych <= 'P') goto yy792;
-		if (yych == 'p') goto yy792;
+		if (yych <= 'P') goto yy925;
+		if (yych == 'p') goto yy925;
 	}
-yy790:
-	YYDEBUG(790, yych);
+yy922:
+	YYDEBUG(922, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{
 	if (CG(short_tags)) {
@@ -9284,9 +9737,10 @@
 		goto inline_char_handler;
 	}
 }
-yy791:
-	YYDEBUG(791, yych);
+yy923:
+	YYDEBUG(923, *YYCURSOR);
 	++YYCURSOR;
+	YYDEBUG(924, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{
 	BEGIN(ST_IN_SCRIPTING);
@@ -9296,32 +9750,32 @@
 	}
 	RETURN_TOKEN(T_OPEN_TAG_WITH_ECHO);
 }
-yy792:
-	YYDEBUG(792, yych);
+yy925:
+	YYDEBUG(925, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == 'H') goto yy794;
-	if (yych == 'h') goto yy794;
-yy793:
-	YYDEBUG(793, yych);
+	if (yych == 'H') goto yy927;
+	if (yych == 'h') goto yy927;
+yy926:
+	YYDEBUG(926, *YYCURSOR);
 	YYCURSOR = YYMARKER;
-	goto yy790;
-yy794:
-	YYDEBUG(794, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'P') goto yy795;
-	if (yych != 'p') goto yy793;
-yy795:
-	YYDEBUG(795, yych);
+	goto yy922;
+yy927:
+	YYDEBUG(927, *YYCURSOR);
+	yych = *++YYCURSOR;
+	if (yych == 'P') goto yy928;
+	if (yych != 'p') goto yy926;
+yy928:
+	YYDEBUG(928, *YYCURSOR);
 	yych = *++YYCURSOR;
 	if (yych <= '\f') {
-		if (yych <= 0x08) goto yy796;
-		if (yych <= '\n') goto yy797;
+		if (yych <= 0x08) goto yy929;
+		if (yych <= '\n') goto yy930;
 	} else {
-		if (yych <= '\r') goto yy799;
-		if (yych == ' ') goto yy797;
+		if (yych <= '\r') goto yy932;
+		if (yych == ' ') goto yy930;
 	}
-yy796:
-	YYDEBUG(796, yych);
+yy929:
+	YYDEBUG(929, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{
 	/* Allow <?php followed by end of file. */
@@ -9337,27 +9791,30 @@
 	}
 	goto inline_char_handler;
 }
-yy797:
-	YYDEBUG(797, yych);
+yy930:
+	YYDEBUG(930, *YYCURSOR);
 	++YYCURSOR;
-yy798:
-	YYDEBUG(798, yych);
+yy931:
+	YYDEBUG(931, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{
 	HANDLE_NEWLINE(yytext[yyleng-1]);
 	BEGIN(ST_IN_SCRIPTING);
 	RETURN_OR_SKIP_TOKEN(T_OPEN_TAG);
 }
-yy799:
-	YYDEBUG(799, yych);
+yy932:
+	YYDEBUG(932, *YYCURSOR);
 	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy797;
-	goto yy798;
+	if (yych == '\n') goto yy930;
+	goto yy931;
 /* *********************************** */
 yyc_ST_END_HEREDOC:
+	YYDEBUG(933, *YYCURSOR);
 	YYFILL(1);
-	YYDEBUG(800, yych);
+	yych = *YYCURSOR;
+	YYDEBUG(935, *YYCURSOR);
 	++YYCURSOR;
+	YYDEBUG(936, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{
 	zend_heredoc_label *heredoc_label = zend_ptr_stack_pop(&SCNG(heredoc_label_stack));
@@ -9373,9 +9830,12 @@
 }
 /* *********************************** */
 yyc_ST_NOWDOC:
+	YYDEBUG(937, *YYCURSOR);
 	YYFILL(1);
-	YYDEBUG(801, yych);
+	yych = *YYCURSOR;
+	YYDEBUG(939, *YYCURSOR);
 	++YYCURSOR;
+	YYDEBUG(940, *YYCURSOR);
 	yyleng = YYCURSOR - SCNG(yy_text);
 	{
 	zend_heredoc_label *heredoc_label = zend_ptr_stack_top(&SCNG(heredoc_label_stack));
diff -Nru php8.2-8.2.29/Zend/zend_language_scanner_defs.h php8.2-8.2.30/Zend/zend_language_scanner_defs.h
--- php8.2-8.2.29/Zend/zend_language_scanner_defs.h	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/Zend/zend_language_scanner_defs.h	2025-12-16 17:18:12.000000000 +0000
@@ -1,4 +1,4 @@
-/* Generated by re2c 4.0 */
+/* Generated by re2c 2.0.3 */
 
 enum YYCONDTYPE {
 	yycST_IN_SCRIPTING,
@@ -11,5 +11,5 @@
 	yycSHEBANG,
 	yycINITIAL,
 	yycST_END_HEREDOC,
-	yycST_NOWDOC
+	yycST_NOWDOC,
 };
diff -Nru php8.2-8.2.29/configure php8.2-8.2.30/configure
--- php8.2-8.2.29/configure	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/configure	2025-12-16 17:18:12.000000000 +0000
@@ -1,12 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.72 for PHP 8.2.29.
+# Generated by GNU Autoconf 2.69 for PHP 8.2.30.
 #
 # Report bugs to <https://github.com/php/php-src/issues>.
 #
 #
-# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
-# Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -17,65 +16,63 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
-then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else case e in #(
-  e) case `(set -o) 2>/dev/null` in #(
+else
+  case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
-esac ;;
 esac
 fi
 
 
-
-# Reset variables that may have inherited troublesome values from
-# the environment.
-
-# IFS needs to be set, to space, tab, and newline, in precisely that order.
-# (If _AS_PATH_WALK were called with IFS unset, it would have the
-# side effect of setting IFS to empty, thus disabling word splitting.)
-# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-IFS=" ""	$as_nl"
-
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# Ensure predictable behavior from utilities with locale-dependent output.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# We cannot yet rely on "unset" to work, but we need these variables
-# to be unset--not just set to an empty or harmless value--now, to
-# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
-# also avoids known problems related to "unset" and subshell syntax
-# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
-for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
-do eval test \${$as_var+y} \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-
-# Ensure that fds 0, 1, and 2 are open.
-if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
-if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
-if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
 
 # The user is always right.
-if ${PATH_SEPARATOR+false} :; then
+if test "${PATH_SEPARATOR+set}" != set; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -84,6 +81,13 @@
 fi
 
 
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -92,27 +96,43 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
   done
 IFS=$as_save_IFS
 
      ;;
 esac
-# We did not find ourselves, most probably we were run as 'sh COMMAND'
+# We did not find ourselves, most probably we were run as `sh COMMAND'
 # in which case we are not to be found in the path.
 if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Use a proper internal environment variable to ensure we don't fall
   # into an infinite loop, continuously re-executing ourselves.
@@ -133,28 +153,26 @@
 esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
-exit 255
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
   fi
   # We don't want this to propagate to other subprocesses.
           { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
-  as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
-then :
+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '\${1+\"\$@\"}'='\"\$@\"'
   setopt NO_GLOB_SUBST
-else case e in #(
-  e) case \`(set -o) 2>/dev/null\` in #(
+else
+  case \`(set -o) 2>/dev/null\` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
-esac ;;
 esac
 fi
 "
@@ -169,55 +187,42 @@
 as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
 as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
 as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" )
-then :
+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
 
-else case e in #(
-  e) exitcode=1; echo positional parameters were not saved. ;;
-esac
+else
+  exitcode=1; echo positional parameters were not saved.
 fi
 test x\$exitcode = x0 || exit 1
-blah=\$(echo \$(echo blah))
-test x\"\$blah\" = xblah || exit 1
 test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
 test \$(( 1 + 1 )) = 2 || exit 1"
-  if (eval "$as_required") 2>/dev/null
-then :
+  if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
-else case e in #(
-  e) as_have_required=no ;;
-esac
+else
+  as_have_required=no
 fi
-  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
-then :
+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
 
-else case e in #(
-  e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+else
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
   as_found=:
   case $as_dir in #(
 	 /*)
 	   for as_base in sh bash ksh sh5; do
 	     # Try only shells that exist, to save several forks.
-	     as_shell=$as_dir$as_base
+	     as_shell=$as_dir/$as_base
 	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		    as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
-then :
+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
   CONFIG_SHELL=$as_shell as_have_required=yes
-		   if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
-then :
+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
   break 2
 fi
 fi
@@ -225,22 +230,14 @@
        esac
   as_found=false
 done
-IFS=$as_save_IFS
-if $as_found
-then :
-
-else case e in #(
-  e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	      as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
-then :
+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
   CONFIG_SHELL=$SHELL as_have_required=yes
-fi ;;
-esac
-fi
+fi; }
+IFS=$as_save_IFS
 
 
-      if test "x$CONFIG_SHELL" != x
-then :
+      if test "x$CONFIG_SHELL" != x; then :
   export CONFIG_SHELL
              # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
@@ -257,28 +254,26 @@
 esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed 'exec'.
-printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
-    if test x$as_have_required = xno
-then :
-  printf "%s\n" "$0: This script requires a shell more modern than all"
-  printf "%s\n" "$0: the shells that I found on your system."
-  if test ${ZSH_VERSION+y} ; then
-    printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-    printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
+    if test x$as_have_required = xno; then :
+  $as_echo "$0: This script requires a shell more modern than all"
+  $as_echo "$0: the shells that I found on your system."
+  if test x${ZSH_VERSION+set} = xset ; then
+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
-    printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and
+    $as_echo "$0: Please tell bug-autoconf@gnu.org and
 $0: https://github.com/php/php-src/issues about your
 $0: system, 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 ;;
-esac
+fi
 fi
 fi
 SHELL=${CONFIG_SHELL-/bin/sh}
@@ -299,7 +294,6 @@
 }
 as_unset=as_fn_unset
 
-
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -331,7 +325,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -340,7 +334,7 @@
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -379,18 +373,16 @@
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
-then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else case e in #(
-  e) as_fn_append ()
+else
+  as_fn_append ()
   {
     eval $1=\$$1\$2
-  } ;;
-esac
+  }
 fi # as_fn_append
 
 # as_fn_arith ARG...
@@ -398,18 +390,16 @@
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
-then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else case e in #(
-  e) as_fn_arith ()
+else
+  as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
-  } ;;
-esac
+  }
 fi # as_fn_arith
 
 
@@ -423,9 +413,9 @@
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -452,7 +442,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -485,8 +475,6 @@
     /[$]LINENO/=
   ' <$as_myself |
     sed '
-      t clear
-      :clear
       s/[$]LINENO.*/&-/
       t lineno
       b
@@ -498,7 +486,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
   # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
   # already done that, so ensure we don't try to do so again and fall
@@ -512,10 +500,6 @@
   exit
 }
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -529,12 +513,6 @@
   ECHO_N='-n';;
 esac
 
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_echo='printf %s\n'
-as_echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -546,9 +524,9 @@
   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 -pR'.
+    # 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 -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
       as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
@@ -573,12 +551,10 @@
 as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
-as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
 # Sed expression to map a string onto a valid variable name.
-as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-as_tr_sh="eval sed '$as_sed_sh'" # deprecated
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 
@@ -756,44 +732,48 @@
 # Identity of this package.
 PACKAGE_NAME='PHP'
 PACKAGE_TARNAME='php'
-PACKAGE_VERSION='8.2.29'
-PACKAGE_STRING='PHP 8.2.29'
+PACKAGE_VERSION='8.2.30'
+PACKAGE_STRING='PHP 8.2.30'
 PACKAGE_BUGREPORT='https://github.com/php/php-src/issues'
 PACKAGE_URL='https://www.php.net'
 
 ac_unique_file="main/php_version.h"
 # Factoring default headers for most tests.
 ac_includes_default="\
-#include <stddef.h>
-#ifdef HAVE_STDIO_H
-# include <stdio.h>
+#include <stdio.h>
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
 #endif
-#ifdef HAVE_STDLIB_H
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
+#ifdef STDC_HEADERS
 # include <stdlib.h>
+# include <stddef.h>
+#else
+# ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+# endif
 #endif
 #ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+#  include <memory.h>
+# endif
 # include <string.h>
 #endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
-ac_header_c_list=
 ac_subst_vars='LTLIBOBJS
 LIBTOOL
 NMEDIT
@@ -1119,6 +1099,7 @@
 enable_huge_code_pages
 enable_opcache_jit
 enable_pcntl
+enable_pdo
 with_pdo_dblib
 with_pdo_firebird
 with_pdo_mysql
@@ -1127,7 +1108,6 @@
 with_pdo_odbc
 with_pdo_pgsql
 with_pdo_sqlite
-enable_pdo
 with_pgsql
 enable_phar
 enable_posix
@@ -1317,6 +1297,8 @@
   *)    ac_optarg=yes ;;
   esac
 
+  # Accept the important Cygnus configure options, so we can diagnose typos.
+
   case $ac_dashdash$ac_option in
   --)
     ac_dashdash=yes ;;
@@ -1357,9 +1339,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: '$ac_useropt'"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1383,9 +1365,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid feature name: '$ac_useropt'"
+      as_fn_error $? "invalid feature name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "enable_$ac_useropt"
@@ -1596,9 +1578,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: '$ac_useropt'"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1612,9 +1594,9 @@
     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
-      as_fn_error $? "invalid package name: '$ac_useropt'"
+      as_fn_error $? "invalid package name: $ac_useropt"
     ac_useropt_orig=$ac_useropt
-    ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/[-+.]/_/g'`
+    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
     case $ac_user_opts in
       *"
 "with_$ac_useropt"
@@ -1642,8 +1624,8 @@
   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
     x_libraries=$ac_optarg ;;
 
-  -*) as_fn_error $? "unrecognized option: '$ac_option'
-Try '$0 --help' for more information"
+  -*) as_fn_error $? "unrecognized option: \`$ac_option'
+Try \`$0 --help' for more information"
     ;;
 
   *=*)
@@ -1651,16 +1633,16 @@
     # Reject names that are not valid shell variable names.
     case $ac_envvar in #(
       '' | [0-9]* | *[!_$as_cr_alnum]* )
-      as_fn_error $? "invalid variable name: '$ac_envvar'" ;;
+      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.
-    printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
@@ -1676,7 +1658,7 @@
   case $enable_option_checking in
     no) ;;
     fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
-    *)     printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   esac
 fi
 
@@ -1701,7 +1683,7 @@
   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'
+# There might be people who depend on the old broken behavior: `$host'
 # used to hold the argument of --host etc.
 # FIXME: To remove some day.
 build=$build_alias
@@ -1740,7 +1722,7 @@
 	 X"$as_myself" : 'X\(//\)[^/]' \| \
 	 X"$as_myself" : 'X\(//\)$' \| \
 	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_myself" |
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1769,7 +1751,7 @@
   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
   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_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=`(
 	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
@@ -1797,7 +1779,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-'configure' configures PHP 8.2.29 to adapt to many kinds of systems.
+\`configure' configures PHP 8.2.30 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1811,11 +1793,11 @@
       --help=short        display options specific to this package
       --help=recursive    display the short help of all the included packages
   -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print 'checking ...' messages
+  -q, --quiet, --silent   do not print \`checking ...' messages
       --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for '--cache-file=config.cache'
+  -C, --config-cache      alias for \`--cache-file=config.cache'
   -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or '..']
+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
 
 Installation directories:
   --prefix=PREFIX         install architecture-independent files in PREFIX
@@ -1823,10 +1805,10 @@
   --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
                           [PREFIX]
 
-By default, 'make install' will install all the files in
-'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than '$ac_default_prefix' using '--prefix',
-for instance '--prefix=\$HOME'.
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
 
 For better control, use the options below.
 
@@ -1869,7 +1851,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PHP 8.2.29:";;
+     short | recursive ) echo "Configuration of PHP 8.2.30:";;
    esac
   cat <<\_ACEOF
 
@@ -2064,6 +2046,7 @@
                           Disable copying PHP CODE pages into HUGE PAGES
   --disable-opcache-jit   Disable JIT
   --enable-pcntl          Enable pcntl support (CLI/CGI only)
+  --disable-pdo           Disable PHP Data Objects support
   --with-pdo-dblib[=DIR]  PDO: DBLIB-DB support. DIR is the FreeTDS home
                           directory
   --with-pdo-firebird[=DIR]
@@ -2093,7 +2076,6 @@
   --with-pdo-pgsql[=DIR]  PDO: PostgreSQL support. DIR is the PostgreSQL base
                           install directory or the path to pg_config
   --without-pdo-sqlite    PDO: sqlite 3 support.
-  --disable-pdo           Disable PHP Data Objects support
   --with-pgsql[=DIR]      Include PostgreSQL support. DIR is the PostgreSQL
                           base install directory or the path to pg_config
   --disable-phar          Disable phar support
@@ -2265,7 +2247,7 @@
               C compiler flags for LIBZIP, overriding pkg-config
   LIBZIP_LIBS linker flags for LIBZIP, overriding pkg-config
 
-Use these variables to override the choices made by 'configure' or to help
+Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 Report bugs to <https://github.com/php/php-src/issues>.
@@ -2285,9 +2267,9 @@
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -2315,8 +2297,7 @@
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
     cd "$ac_dir" || { ac_status=$?; continue; }
-    # Check for configure.gnu first; this name is used for a wrapper for
-    # Metaconfig's "Configure" on case-insensitive file systems.
+    # Check for guested configure.
     if test -f "$ac_srcdir/configure.gnu"; then
       echo &&
       $SHELL "$ac_srcdir/configure.gnu" --help=recursive
@@ -2324,7 +2305,7 @@
       echo &&
       $SHELL "$ac_srcdir/configure" --help=recursive
     else
-      printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi || ac_status=$?
     cd "$ac_pwd" || { ac_status=$?; break; }
   done
@@ -2333,10 +2314,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-PHP configure 8.2.29
-generated by GNU Autoconf 2.72
+PHP configure 8.2.30
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -2353,14 +2334,14 @@
 ac_fn_c_try_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest.beam
+  rm -f conftest.$ac_objext
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2368,19 +2349,17 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext
-then :
+       } && test -s conftest.$ac_objext; then :
   ac_retval=0
-else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1 ;;
-esac
+	ac_retval=1
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
@@ -2399,7 +2378,7 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2407,25 +2386,156 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       }
-then :
+       }; then :
   ac_retval=0
-else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-    ac_retval=1 ;;
-esac
+    ac_retval=1
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
 
+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
+# -------------------------------------------------------
+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
+# the include files in INCLUDES and setting the cache variable VAR
+# accordingly.
+ac_fn_c_check_header_mongrel ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if eval \${$3+:} false; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+else
+  # Is the header compilable?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
+$as_echo_n "checking $2 usability... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$4
+#include <$2>
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_header_compiler=yes
+else
+  ac_header_compiler=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
+$as_echo_n "checking $2 presence... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <$2>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
+  ac_header_preproc=yes
+else
+  ac_header_preproc=no
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
+  yes:no: )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+    ;;
+  no:yes:* )
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
+( $as_echo "## ---------------------------------------------------- ##
+## Report this to https://github.com/php/php-src/issues ##
+## ---------------------------------------------------- ##"
+     ) | sed "s/^/$as_me: WARNING:     /" >&2
+    ;;
+esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=\$ac_header_compiler"
+fi
+eval ac_res=\$$3
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+fi
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+
+} # ac_fn_c_check_header_mongrel
+
+# ac_fn_c_try_run LINENO
+# ----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
+# that executables *can* be run.
+ac_fn_c_try_run ()
+{
+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+  if { { ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_link") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+  { { case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+  (eval "$ac_try") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; }; then :
+  ac_retval=0
+else
+  $as_echo "$as_me: program exited with status $ac_status" >&5
+       $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+       ac_retval=$ac_status
+fi
+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
 # Tests whether HEADER exists and can be compiled using the include files in
@@ -2433,30 +2543,26 @@
 ac_fn_c_check_header_compile ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 #include <$2>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   eval "$3=yes"
-else case e in #(
-  e) eval "$3=no" ;;
-esac
+else
+  eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
@@ -2467,14 +2573,14 @@
 ac_fn_c_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext conftest.beam conftest$ac_exeext
+  rm -f conftest.$ac_objext conftest$ac_exeext
   if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2482,22 +2588,20 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
 	 test -x conftest$ac_exeext
-       }
-then :
+       }; then :
   ac_retval=0
-else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1 ;;
-esac
+	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
@@ -2515,22 +2619,28 @@
 ac_fn_c_check_func ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 /* Define $2 to an innocuous variant, in case <limits.h> declares $2.
    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 (void); below.  */
+    which can conflict with char $2 (); below.
+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+    <limits.h> exists even on freestanding compilers.  */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 
-#include <limits.h>
 #undef $2
 
 /* Override any GCC internal prototype to avoid an error.
@@ -2539,7 +2649,7 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char $2 (void);
+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.  */
@@ -2548,89 +2658,42 @@
 #endif
 
 int
-main (void)
+main ()
 {
 return $2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$3=yes"
-else case e in #(
-  e) eval "$3=no" ;;
-esac
+else
+  eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that
-# executables *can* be run.
-ac_fn_c_try_run ()
-{
-  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if { { ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-  { { case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; }
-then :
-  ac_retval=0
-else case e in #(
-  e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5
-       printf "%s\n" "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-       ac_retval=$ac_status ;;
-esac
-fi
-  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
-  as_fn_set_status $ac_retval
-
-} # ac_fn_c_try_run
-
 # ac_fn_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 conftest.beam
+  rm -f conftest.$ac_objext
   if { { ac_try="$ac_compile"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2638,19 +2701,17 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext
-then :
+       } && test -s conftest.$ac_objext; then :
   ac_retval=0
-else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1 ;;
-esac
+	ac_retval=1
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
@@ -2669,7 +2730,7 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -2677,19 +2738,17 @@
     cat conftest.er1 >&5
     mv -f conftest.er1 conftest.err
   fi
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
-       }
-then :
+       }; then :
   ac_retval=0
-else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-    ac_retval=1 ;;
-esac
+    ac_retval=1
 fi
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
@@ -2703,17 +2762,16 @@
 ac_fn_c_check_member ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
-printf %s "checking for $2.$3... " >&6; }
-if eval test \${$4+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
+$as_echo_n "checking for $2.$3... " >&6; }
+if eval \${$4+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
-main (void)
+main ()
 {
 static $2 ac_aggr;
 if (ac_aggr.$3)
@@ -2722,15 +2780,14 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   eval "$4=yes"
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $5
 int
-main (void)
+main ()
 {
 static $2 ac_aggr;
 if (sizeof ac_aggr.$3)
@@ -2739,48 +2796,41 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   eval "$4=yes"
-else case e in #(
-  e) eval "$4=no" ;;
-esac
+else
+  eval "$4=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$4
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_member
 
-# ac_fn_check_decl LINENO SYMBOL VAR INCLUDES EXTRA-OPTIONS FLAG-VAR
-# ------------------------------------------------------------------
+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
+# ---------------------------------------------
 # Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
-# accordingly. Pass EXTRA-OPTIONS to the compiler, using FLAG-VAR.
-ac_fn_check_decl ()
+# accordingly.
+ac_fn_c_check_decl ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   as_decl_name=`echo $2|sed 's/ *(.*//'`
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
-printf %s "checking whether $as_decl_name is declared... " >&6; }
-if eval test \${$3+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
-  eval ac_save_FLAGS=\$$6
-  as_fn_append $6 " $5"
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 #ifndef $as_decl_name
 #ifdef __cplusplus
@@ -2794,24 +2844,19 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   eval "$3=yes"
-else case e in #(
-  e) eval "$3=no" ;;
-esac
+else
+  eval "$3=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  eval $6=\$ac_save_FLAGS
- ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
-} # ac_fn_check_decl
+} # ac_fn_c_check_decl
 
 # ac_fn_c_check_type LINENO TYPE VAR INCLUDES
 # -------------------------------------------
@@ -2820,18 +2865,17 @@
 ac_fn_c_check_type ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-printf %s "checking for $2... " >&6; }
-if eval test \${$3+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) eval "$3=no"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+$as_echo_n "checking for $2... " >&6; }
+if eval \${$3+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  eval "$3=no"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 if (sizeof ($2))
 	 return 0;
@@ -2839,13 +2883,12 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 if (sizeof (($2)))
 	    return 0;
@@ -2853,21 +2896,18 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-else case e in #(
-  e) eval "$3=yes" ;;
-esac
+else
+  eval "$3=yes"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 eval ac_res=\$$3
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
   eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_type
@@ -2886,7 +2926,7 @@
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 static int test_array [1 - 2 * !(($2) >= 0)];
 test_array [0] = 0;
@@ -2896,15 +2936,14 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_lo=0 ac_mid=0
   while :; do
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
 test_array [0] = 0;
@@ -2914,26 +2953,24 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_hi=$ac_mid; break
-else case e in #(
-  e) as_fn_arith $ac_mid + 1 && ac_lo=$as_val
+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 ;;
-esac
+			as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 static int test_array [1 - 2 * !(($2) < 0)];
 test_array [0] = 0;
@@ -2943,15 +2980,14 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_hi=-1 ac_mid=-1
   while :; do
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 static int test_array [1 - 2 * !(($2) >= $ac_mid)];
 test_array [0] = 0;
@@ -2961,28 +2997,24 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_lo=$ac_mid; break
-else case e in #(
-  e) as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val
+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 ;;
-esac
+			as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
-else case e in #(
-  e) ac_lo= ac_hi= ;;
-esac
+else
+  ac_lo= ac_hi=
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 # Binary search between lo and hi bounds.
 while test "x$ac_lo" != "x$ac_hi"; do
   as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val
@@ -2990,7 +3022,7 @@
 /* end confdefs.h.  */
 $4
 int
-main (void)
+main ()
 {
 static int test_array [1 - 2 * !(($2) <= $ac_mid)];
 test_array [0] = 0;
@@ -3000,14 +3032,12 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_hi=$ac_mid
-else case e in #(
-  e) as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val ;;
-esac
+else
+  as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 case $ac_lo in #((
 ?*) eval "$3=\$ac_lo"; ac_retval=0 ;;
@@ -3017,12 +3047,12 @@
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $4
-static long int longval (void) { return $2; }
-static unsigned long int ulongval (void) { return $2; }
+static long int longval () { return $2; }
+static unsigned long int ulongval () { return $2; }
 #include <stdio.h>
 #include <stdlib.h>
 int
-main (void)
+main ()
 {
 
   FILE *f = fopen ("conftest.val", "w");
@@ -3050,12 +3080,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   echo >>conftest.val; read $3 <conftest.val; ac_retval=0
-else case e in #(
-  e) ac_retval=1 ;;
-esac
+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
@@ -3066,34 +3094,14 @@
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_compute_int
-ac_configure_args_raw=
-for ac_arg
-do
-  case $ac_arg in
-  *\'*)
-    ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-  esac
-  as_fn_append ac_configure_args_raw " '$ac_arg'"
-done
-
-case $ac_configure_args_raw in
-  *$as_nl*)
-    ac_safe_unquote= ;;
-  *)
-    ac_unsafe_z='|&;<>()$`\\"*?[ ''	' # This string ends in space, tab.
-    ac_unsafe_a="$ac_unsafe_z#~"
-    ac_safe_unquote="s/ '\\([^$ac_unsafe_a][^$ac_unsafe_z]*\\)'/ \\1/g"
-    ac_configure_args_raw=`      printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
-esac
-
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by PHP $as_me 8.2.29, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+It was created by PHP $as_me 8.2.30, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
-  $ $0$ac_configure_args_raw
+  $ $0 $@
 
 _ACEOF
 exec 5>>config.log
@@ -3126,12 +3134,8 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    printf "%s\n" "PATH: $as_dir"
+  test -z "$as_dir" && as_dir=.
+    $as_echo "PATH: $as_dir"
   done
 IFS=$as_save_IFS
 
@@ -3166,7 +3170,7 @@
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -3201,13 +3205,11 @@
 # WARNING: Use '\'' to represent an apostrophe within the trap.
 # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
-  # Sanitize IFS.
-  IFS=" ""	$as_nl"
   # Save into config.log some information that might help in debugging.
   {
     echo
 
-    printf "%s\n" "## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##"
     echo
@@ -3218,8 +3220,8 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -3243,7 +3245,7 @@
 )
     echo
 
-    printf "%s\n" "## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
     echo
@@ -3251,14 +3253,14 @@
     do
       eval ac_val=\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
       esac
-      printf "%s\n" "$ac_var='\''$ac_val'\''"
+      $as_echo "$ac_var='\''$ac_val'\''"
     done | sort
     echo
 
     if test -n "$ac_subst_files"; then
-      printf "%s\n" "## ------------------- ##
+      $as_echo "## ------------------- ##
 ## File substitutions. ##
 ## ------------------- ##"
       echo
@@ -3266,15 +3268,15 @@
       do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	printf "%s\n" "$ac_var='\''$ac_val'\''"
+	$as_echo "$ac_var='\''$ac_val'\''"
       done | sort
       echo
     fi
 
     if test -s confdefs.h; then
-      printf "%s\n" "## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
       echo
@@ -3282,8 +3284,8 @@
       echo
     fi
     test "$ac_signal" != 0 &&
-      printf "%s\n" "$as_me: caught signal $ac_signal"
-    printf "%s\n" "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -3297,50 +3299,65 @@
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-printf "%s\n" "/* confdefs.h */" > confdefs.h
+$as_echo "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
 
-printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_URL "$PACKAGE_URL"
+_ACEOF
 
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
-  ac_site_files="$CONFIG_SITE"
+  # We do not want a PATH search for config.site.
+  case $CONFIG_SITE in #((
+    -*)  ac_site_file1=./$CONFIG_SITE;;
+    */*) ac_site_file1=$CONFIG_SITE;;
+    *)   ac_site_file1=./$CONFIG_SITE;;
+  esac
 elif test "x$prefix" != xNONE; then
-  ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
+  ac_site_file1=$prefix/share/config.site
+  ac_site_file2=$prefix/etc/config.site
 else
-  ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+  ac_site_file1=$ac_default_prefix/share/config.site
+  ac_site_file2=$ac_default_prefix/etc/config.site
 fi
-
-for ac_site_file in $ac_site_files
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
-  case $ac_site_file in #(
-  */*) :
-     ;; #(
-  *) :
-    ac_site_file=./$ac_site_file ;;
-esac
-  if test -f "$ac_site_file" && test -r "$ac_site_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
+  test "x$ac_site_file" = xNONE && continue
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
     . "$ac_site_file" \
-      || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -3348,670 +3365,19 @@
   # Some versions of bash will fail to source /dev/null (special files
   # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
   if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
 
-# Test code for whether the C compiler supports C89 (global declarations)
-ac_c_conftest_c89_globals='
-/* Does the compiler advertise C89 conformance?
-   Do not test the value of __STDC__, because some compilers set it to 0
-   while being otherwise adequately conformant. */
-#if !defined __STDC__
-# error "Compiler does not advertise C89 conformance"
-#endif
-
-#include <stddef.h>
-#include <stdarg.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7 src/conf.sh.  */
-struct buf { int x; };
-struct buf * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (char **p, int i)
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* C89 style stringification. */
-#define noexpand_stringify(a) #a
-const char *stringified = noexpand_stringify(arbitrary+token=sequence);
-
-/* C89 style token pasting.  Exercises some of the corner cases that
-   e.g. old MSVC gets wrong, but not very hard. */
-#define noexpand_concat(a,b) a##b
-#define expand_concat(a,b) noexpand_concat(a,b)
-extern int vA;
-extern int vbee;
-#define aye A
-#define bee B
-int *pvA = &expand_concat(v,aye);
-int *pvbee = &noexpand_concat(v,bee);
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not \xHH hex character constants.
-   These do not provoke an error unfortunately, instead are silently treated
-   as an "x".  The following induces an error, until -std is added to get
-   proper ANSI mode.  Curiously \x00 != x always comes out true, for an
-   array size at least.  It is necessary to write \x00 == 0 to get something
-   that is true only with -std.  */
-int osf4_cc_array ['\''\x00'\'' == 0 ? 1 : -1];
-
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-   inside strings and character constants.  */
-#define FOO(x) '\''x'\''
-int xlc6_cc_array[FOO(a) == '\''x'\'' ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),
-               int, int);'
-
-# Test code for whether the C compiler supports C89 (body of main).
-ac_c_conftest_c89_main='
-ok |= (argc == 0 || f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]);
-'
-
-# Test code for whether the C compiler supports C99 (global declarations)
-ac_c_conftest_c99_globals='
-/* Does the compiler advertise C99 conformance? */
-#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
-# error "Compiler does not advertise C99 conformance"
-#endif
-
-// See if C++-style comments work.
-
-#include <stdbool.h>
-extern int puts (const char *);
-extern int printf (const char *, ...);
-extern int dprintf (int, const char *, ...);
-extern void *malloc (size_t);
-extern void free (void *);
-
-// Check varargs macros.  These examples are taken from C99 6.10.3.5.
-// dprintf is used instead of fprintf to avoid needing to declare
-// FILE and stderr.
-#define debug(...) dprintf (2, __VA_ARGS__)
-#define showlist(...) puts (#__VA_ARGS__)
-#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
-static void
-test_varargs_macros (void)
-{
-  int x = 1234;
-  int y = 5678;
-  debug ("Flag");
-  debug ("X = %d\n", x);
-  showlist (The first, second, and third items.);
-  report (x>y, "x is %d but y is %d", x, y);
-}
-
-// Check long long types.
-#define BIG64 18446744073709551615ull
-#define BIG32 4294967295ul
-#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
-#if !BIG_OK
-  #error "your preprocessor is broken"
-#endif
-#if BIG_OK
-#else
-  #error "your preprocessor is broken"
-#endif
-static long long int bignum = -9223372036854775807LL;
-static unsigned long long int ubignum = BIG64;
-
-struct incomplete_array
-{
-  int datasize;
-  double data[];
-};
-
-struct named_init {
-  int number;
-  const wchar_t *name;
-  double average;
-};
-
-typedef const char *ccp;
-
-static inline int
-test_restrict (ccp restrict text)
-{
-  // Iterate through items via the restricted pointer.
-  // Also check for declarations in for loops.
-  for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
-    continue;
-  return 0;
-}
-
-// Check varargs and va_copy.
-static bool
-test_varargs (const char *format, ...)
-{
-  va_list args;
-  va_start (args, format);
-  va_list args_copy;
-  va_copy (args_copy, args);
-
-  const char *str = "";
-  int number = 0;
-  float fnumber = 0;
-
-  while (*format)
-    {
-      switch (*format++)
-	{
-	case '\''s'\'': // string
-	  str = va_arg (args_copy, const char *);
-	  break;
-	case '\''d'\'': // int
-	  number = va_arg (args_copy, int);
-	  break;
-	case '\''f'\'': // float
-	  fnumber = va_arg (args_copy, double);
-	  break;
-	default:
-	  break;
-	}
-    }
-  va_end (args_copy);
-  va_end (args);
-
-  return *str && number && fnumber;
-}
-'
-
-# Test code for whether the C compiler supports C99 (body of main).
-ac_c_conftest_c99_main='
-  // Check bool.
-  _Bool success = false;
-  success |= (argc != 0);
-
-  // Check restrict.
-  if (test_restrict ("String literal") == 0)
-    success = true;
-  char *restrict newvar = "Another string";
-
-  // Check varargs.
-  success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
-  test_varargs_macros ();
-
-  // Check flexible array members.
-  struct incomplete_array *ia =
-    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
-  ia->datasize = 10;
-  for (int i = 0; i < ia->datasize; ++i)
-    ia->data[i] = i * 1.234;
-  // Work around memory leak warnings.
-  free (ia);
-
-  // Check named initializers.
-  struct named_init ni = {
-    .number = 34,
-    .name = L"Test wide string",
-    .average = 543.34343,
-  };
-
-  ni.number = 58;
-
-  int dynamic_array[ni.number];
-  dynamic_array[0] = argv[0][0];
-  dynamic_array[ni.number - 1] = 543;
-
-  // work around unused variable warnings
-  ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == '\''x'\''
-	 || dynamic_array[ni.number - 1] != 543);
-'
-
-# Test code for whether the C compiler supports C11 (global declarations)
-ac_c_conftest_c11_globals='
-/* Does the compiler advertise C11 conformance? */
-#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
-# error "Compiler does not advertise C11 conformance"
-#endif
-
-// Check _Alignas.
-char _Alignas (double) aligned_as_double;
-char _Alignas (0) no_special_alignment;
-extern char aligned_as_int;
-char _Alignas (0) _Alignas (int) aligned_as_int;
-
-// Check _Alignof.
-enum
-{
-  int_alignment = _Alignof (int),
-  int_array_alignment = _Alignof (int[100]),
-  char_alignment = _Alignof (char)
-};
-_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
-
-// Check _Noreturn.
-int _Noreturn does_not_return (void) { for (;;) continue; }
-
-// Check _Static_assert.
-struct test_static_assert
-{
-  int x;
-  _Static_assert (sizeof (int) <= sizeof (long int),
-                  "_Static_assert does not work in struct");
-  long int y;
-};
-
-// Check UTF-8 literals.
-#define u8 syntax error!
-char const utf8_literal[] = u8"happens to be ASCII" "another string";
-
-// Check duplicate typedefs.
-typedef long *long_ptr;
-typedef long int *long_ptr;
-typedef long_ptr long_ptr;
-
-// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
-struct anonymous
-{
-  union {
-    struct { int i; int j; };
-    struct { int k; long int l; } w;
-  };
-  int m;
-} v1;
-'
-
-# Test code for whether the C compiler supports C11 (body of main).
-ac_c_conftest_c11_main='
-  _Static_assert ((offsetof (struct anonymous, i)
-		   == offsetof (struct anonymous, w.k)),
-		  "Anonymous union alignment botch");
-  v1.i = 2;
-  v1.w.k = 5;
-  ok |= v1.i != 5;
-'
-
-# Test code for whether the C compiler supports C11 (complete).
-ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
-${ac_c_conftest_c99_globals}
-${ac_c_conftest_c11_globals}
-
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_c_conftest_c89_main}
-  ${ac_c_conftest_c99_main}
-  ${ac_c_conftest_c11_main}
-  return ok;
-}
-"
-
-# Test code for whether the C compiler supports C99 (complete).
-ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
-${ac_c_conftest_c99_globals}
-
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_c_conftest_c89_main}
-  ${ac_c_conftest_c99_main}
-  return ok;
-}
-"
-
-# Test code for whether the C compiler supports C89 (complete).
-ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
-
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_c_conftest_c89_main}
-  return ok;
-}
-"
-
-as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
-as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
-as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
-as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
-as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
-as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
-as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
-as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
-as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
-as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H"
-as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H"
-# Test code for whether the C++ compiler supports C++98 (global declarations)
-ac_cxx_conftest_cxx98_globals='
-// Does the compiler advertise C++98 conformance?
-#if !defined __cplusplus || __cplusplus < 199711L
-# error "Compiler does not advertise C++98 conformance"
-#endif
-
-// These inclusions are to reject old compilers that
-// lack the unsuffixed header files.
-#include <cstdlib>
-#include <exception>
-
-// <cassert> and <cstring> are *not* freestanding headers in C++98.
-extern void assert (int);
-namespace std {
-  extern int strcmp (const char *, const char *);
-}
-
-// Namespaces, exceptions, and templates were all added after "C++ 2.0".
-using std::exception;
-using std::strcmp;
-
-namespace {
-
-void test_exception_syntax()
-{
-  try {
-    throw "test";
-  } catch (const char *s) {
-    // Extra parentheses suppress a warning when building autoconf itself,
-    // due to lint rules shared with more typical C programs.
-    assert (!(strcmp) (s, "test"));
-  }
-}
-
-template <typename T> struct test_template
-{
-  T const val;
-  explicit test_template(T t) : val(t) {}
-  template <typename U> T add(U u) { return static_cast<T>(u) + val; }
-};
-
-} // anonymous namespace
-'
-
-# Test code for whether the C++ compiler supports C++98 (body of main)
-ac_cxx_conftest_cxx98_main='
-  assert (argc);
-  assert (! argv[0]);
-{
-  test_exception_syntax ();
-  test_template<double> tt (2.0);
-  assert (tt.add (4) == 6.0);
-  assert (true && !false);
-}
-'
-
-# Test code for whether the C++ compiler supports C++11 (global declarations)
-ac_cxx_conftest_cxx11_globals='
-// Does the compiler advertise C++ 2011 conformance?
-#if !defined __cplusplus || __cplusplus < 201103L
-# error "Compiler does not advertise C++11 conformance"
-#endif
-
-namespace cxx11test
-{
-  constexpr int get_val() { return 20; }
-
-  struct testinit
-  {
-    int i;
-    double d;
-  };
-
-  class delegate
-  {
-  public:
-    delegate(int n) : n(n) {}
-    delegate(): delegate(2354) {}
-
-    virtual int getval() { return this->n; };
-  protected:
-    int n;
-  };
-
-  class overridden : public delegate
-  {
-  public:
-    overridden(int n): delegate(n) {}
-    virtual int getval() override final { return this->n * 2; }
-  };
-
-  class nocopy
-  {
-  public:
-    nocopy(int i): i(i) {}
-    nocopy() = default;
-    nocopy(const nocopy&) = delete;
-    nocopy & operator=(const nocopy&) = delete;
-  private:
-    int i;
-  };
-
-  // for testing lambda expressions
-  template <typename Ret, typename Fn> Ret eval(Fn f, Ret v)
-  {
-    return f(v);
-  }
-
-  // for testing variadic templates and trailing return types
-  template <typename V> auto sum(V first) -> V
-  {
-    return first;
-  }
-  template <typename V, typename... Args> auto sum(V first, Args... rest) -> V
-  {
-    return first + sum(rest...);
-  }
-}
-'
-
-# Test code for whether the C++ compiler supports C++11 (body of main)
-ac_cxx_conftest_cxx11_main='
-{
-  // Test auto and decltype
-  auto a1 = 6538;
-  auto a2 = 48573953.4;
-  auto a3 = "String literal";
-
-  int total = 0;
-  for (auto i = a3; *i; ++i) { total += *i; }
-
-  decltype(a2) a4 = 34895.034;
-}
-{
-  // Test constexpr
-  short sa[cxx11test::get_val()] = { 0 };
-}
-{
-  // Test initializer lists
-  cxx11test::testinit il = { 4323, 435234.23544 };
-}
-{
-  // Test range-based for
-  int array[] = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3,
-                 14, 19, 17, 8, 6, 20, 16, 2, 11, 1};
-  for (auto &x : array) { x += 23; }
-}
-{
-  // Test lambda expressions
-  using cxx11test::eval;
-  assert (eval ([](int x) { return x*2; }, 21) == 42);
-  double d = 2.0;
-  assert (eval ([&](double x) { return d += x; }, 3.0) == 5.0);
-  assert (d == 5.0);
-  assert (eval ([=](double x) mutable { return d += x; }, 4.0) == 9.0);
-  assert (d == 5.0);
-}
-{
-  // Test use of variadic templates
-  using cxx11test::sum;
-  auto a = sum(1);
-  auto b = sum(1, 2);
-  auto c = sum(1.0, 2.0, 3.0);
-}
-{
-  // Test constructor delegation
-  cxx11test::delegate d1;
-  cxx11test::delegate d2();
-  cxx11test::delegate d3(45);
-}
-{
-  // Test override and final
-  cxx11test::overridden o1(55464);
-}
-{
-  // Test nullptr
-  char *c = nullptr;
-}
-{
-  // Test template brackets
-  test_template<::test_template<int>> v(test_template<int>(12));
-}
-{
-  // Unicode literals
-  char const *utf8 = u8"UTF-8 string \u2500";
-  char16_t const *utf16 = u"UTF-8 string \u2500";
-  char32_t const *utf32 = U"UTF-32 string \u2500";
-}
-'
-
-# Test code for whether the C compiler supports C++11 (complete).
-ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals}
-${ac_cxx_conftest_cxx11_globals}
-
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_cxx_conftest_cxx98_main}
-  ${ac_cxx_conftest_cxx11_main}
-  return ok;
-}
-"
-
-# Test code for whether the C compiler supports C++98 (complete).
-ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals}
-int
-main (int argc, char **argv)
-{
-  int ok = 0;
-  ${ac_cxx_conftest_cxx98_main}
-  return ok;
-}
-"
-
-
-# Auxiliary files required by this configure script.
-ac_aux_files="config.guess config.sub"
-
-# Locations in which to look for auxiliary files.
-ac_aux_dir_candidates="${srcdir}/build"
-
-# Search for a directory containing all of the required auxiliary files,
-# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
-# If we don't find one directory that contains all the files we need,
-# we report the set of missing files from the *first* directory in
-# $ac_aux_dir_candidates and give up.
-ac_missing_aux_files=""
-ac_first_candidate=:
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-as_found=false
-for as_dir in $ac_aux_dir_candidates
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-  as_found=:
-
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}:  trying $as_dir" >&5
-  ac_aux_dir_found=yes
-  ac_install_sh=
-  for ac_aux in $ac_aux_files
-  do
-    # As a special case, if "install-sh" is required, that requirement
-    # can be satisfied by any of "install-sh", "install.sh", or "shtool",
-    # and $ac_install_sh is set appropriately for whichever one is found.
-    if test x"$ac_aux" = x"install-sh"
-    then
-      if test -f "${as_dir}install-sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install-sh found" >&5
-        ac_install_sh="${as_dir}install-sh -c"
-      elif test -f "${as_dir}install.sh"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}install.sh found" >&5
-        ac_install_sh="${as_dir}install.sh -c"
-      elif test -f "${as_dir}shtool"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}shtool found" >&5
-        ac_install_sh="${as_dir}shtool install -c"
-      else
-        ac_aux_dir_found=no
-        if $ac_first_candidate; then
-          ac_missing_aux_files="${ac_missing_aux_files} install-sh"
-        else
-          break
-        fi
-      fi
-    else
-      if test -f "${as_dir}${ac_aux}"; then
-        printf "%s\n" "$as_me:${as_lineno-$LINENO}:   ${as_dir}${ac_aux} found" >&5
-      else
-        ac_aux_dir_found=no
-        if $ac_first_candidate; then
-          ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}"
-        else
-          break
-        fi
-      fi
-    fi
-  done
-  if test "$ac_aux_dir_found" = yes; then
-    ac_aux_dir="$as_dir"
-    break
-  fi
-  ac_first_candidate=false
-
-  as_found=false
-done
-IFS=$as_save_IFS
-if $as_found
-then :
-
-else case e in #(
-  e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;;
-esac
-fi
-
-
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-if test -f "${ac_aux_dir}config.guess"; then
-  ac_config_guess="$SHELL ${ac_aux_dir}config.guess"
-fi
-if test -f "${ac_aux_dir}config.sub"; then
-  ac_config_sub="$SHELL ${ac_aux_dir}config.sub"
-fi
-if test -f "$ac_aux_dir/configure"; then
-  ac_configure="$SHELL ${ac_aux_dir}configure"
-fi
-
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -4022,12 +3388,12 @@
   eval ac_new_val=\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
-printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
@@ -4036,24 +3402,24 @@
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
-printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
 	  ac_cache_corrupted=:
 	else
-	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
-printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
 	  eval $ac_var=\$ac_old_val
 	fi
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   former value:  '$ac_old_val'" >&5
-printf "%s\n" "$as_me:   former value:  '$ac_old_val'" >&2;}
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}:   current value: '$ac_new_val'" >&5
-printf "%s\n" "$as_me:   current value: '$ac_new_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" = set; then
     case $ac_new_val in
-    *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
     *) ac_arg=$ac_var=$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -4063,12 +3429,11 @@
   fi
 done
 if $ac_cache_corrupted; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
-  as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file'
-	    and start over" "$LINENO" 5
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -4082,49 +3447,70 @@
 
 
 
+ac_aux_dir=
+for ac_dir in build "$srcdir"/build; do
+  if test -f "$ac_dir/install-sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f "$ac_dir/install.sh"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  elif test -f "$ac_dir/shtool"; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/shtool install -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in build \"$srcdir\"/build" "$LINENO" 5
+fi
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-printf %s "checking for grep that handles long lines and -e... " >&6; }
-if test ${ac_cv_path_GREP+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -z "$GREP"; then
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+if ${ac_cv_path_GREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
   ac_path_GREP_found=false
   # Loop through the user's path and test for each of PROGNAME-LIST
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_prog in grep ggrep
-   do
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in #(
+case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-#(
 *)
   ac_count=0
-  printf %s 0123456789 >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4150,21 +3536,19 @@
 else
   ac_cv_path_GREP=$GREP
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-printf "%s\n" "$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP="$ac_cv_path_GREP"
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-printf %s "checking for egrep... " >&6; }
-if test ${ac_cv_path_EGREP+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
+if ${ac_cv_path_EGREP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP="$GREP -E"
    else
      if test -z "$EGREP"; then
@@ -4174,31 +3558,25 @@
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_prog in egrep
-   do
+  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"
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in #(
+case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-#(
 *)
   ac_count=0
-  printf %s 0123456789 >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" '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
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4225,23 +3603,19 @@
   ac_cv_path_EGREP=$EGREP
 fi
 
-   fi ;;
-esac
+   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-printf "%s\n" "$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"
 
-         EGREP_TRADITIONAL=$EGREP
- ac_cv_path_EGREP_TRADITIONAL=$EGREP
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-printf %s "checking for a sed that does not truncate output... " >&6; }
-if test ${ac_cv_path_SED+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)           ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+            ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
      for ac_i in 1 2 3 4 5 6 7; do
        ac_script="$ac_script$as_nl$ac_script"
      done
@@ -4254,31 +3628,25 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_prog in sed gsed
-   do
+  test -z "$as_dir" && as_dir=.
+    for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_SED="$as_dir$ac_prog$ac_exec_ext"
+      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
       as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
-case `"$ac_path_SED" --version 2>&1` in #(
+case `"$ac_path_SED" --version 2>&1` in
 *GNU*)
   ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
-#(
 *)
   ac_count=0
-  printf %s 0123456789 >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    printf "%s\n" '' >> "conftest.nl"
+    $as_echo '' >> "conftest.nl"
     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     as_fn_arith $ac_count + 1 && ac_count=$as_val
@@ -4304,11 +3672,10 @@
 else
   ac_cv_path_SED=$SED
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-printf "%s\n" "$ac_cv_path_SED" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
  SED="$ac_cv_path_SED"
   rm -f conftest.sed
 
@@ -4366,7 +3733,7 @@
    else
     break
    fi
-   printf "%s\n" "$CURRENT_ARG \\" >>config.nice
+   $as_echo "$CURRENT_ARG \\" >>config.nice
    CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $CURRENT_ARG"
   done
   echo '"$@"' >> config.nice
@@ -4386,31 +3753,26 @@
 
 
 
-
-
-
-  # Make sure we can run config.sub.
-$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
-  as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-printf %s "checking build system type... " >&6; }
-if test ${ac_cv_build+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_build_alias=$build_alias
+# Make sure we can run config.sub.
+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
+if ${ac_cv_build+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
-  ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
+  ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
 test "x$ac_build_alias" = x &&
   as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
-  as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
- ;;
-esac
+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-printf "%s\n" "$ac_cv_build" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -4429,23 +3791,21 @@
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-printf %s "checking host system type... " >&6; }
-if test ${ac_cv_host+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test "x$host_alias" = x; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
+if ${ac_cv_host+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "x$host_alias" = x; then
   ac_cv_host=$ac_cv_build
 else
-  ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
-    as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-printf "%s\n" "$ac_cv_host" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -4464,23 +3824,21 @@
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
-printf %s "checking target system type... " >&6; }
-if test ${ac_cv_target+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test "x$target_alias" = x; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
+$as_echo_n "checking target system type... " >&6; }
+if ${ac_cv_target+:} false; 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` ||
-    as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $target_alias failed" "$LINENO" 5
+  ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
-printf "%s\n" "$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
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
@@ -4521,7 +3879,7 @@
 
 
 ac_IFS=$IFS; IFS="."
-set $(echo 8.2.29 | "${SED}" 's/\([0-9\.]*\)\(.*\)/\1\.\2/')
+set $(echo 8.2.30 | "${SED}" 's/\([0-9\.]*\)\(.*\)/\1\.\2/')
 IFS=$ac_IFS
 PHP_MAJOR_VERSION=$1
 PHP_MINOR_VERSION=$2
@@ -4595,13 +3953,12 @@
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_PKG_CONFIG+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) case $PKG_CONFIG in
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
   ;;
@@ -4610,15 +3967,11 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4626,16 +3979,15 @@
 IFS=$as_save_IFS
 
   ;;
-esac ;;
 esac
 fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 if test -n "$PKG_CONFIG"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-printf "%s\n" "$PKG_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4644,13 +3996,12 @@
   ac_pt_PKG_CONFIG=$PKG_CONFIG
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) case $ac_pt_PKG_CONFIG in
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
   ;;
@@ -4659,15 +4010,11 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4675,16 +4022,15 @@
 IFS=$as_save_IFS
 
   ;;
-esac ;;
 esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -4692,8 +4038,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     PKG_CONFIG=$ac_pt_PKG_CONFIG
@@ -4705,26 +4051,17 @@
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	else
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
 fi
-
-
-
-
-
-
-
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4735,44 +4072,38 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CC+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$CC"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-printf "%s\n" "$CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+$as_echo "$CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4785,44 +4116,38 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CC+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_CC"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-printf "%s\n" "$ac_ct_CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -4834,8 +4159,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CC=$ac_ct_CC
@@ -4843,23 +4168,23 @@
 fi
 
 
-test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-for ac_option in --version -v -V -qversion -version; do
+for ac_option in --version -v -V -qversion; do
   { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -4869,7 +4194,7 @@
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
@@ -4877,7 +4202,7 @@
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
@@ -4889,9 +4214,9 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-printf %s "checking whether the C compiler works... " >&6; }
-ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -4912,14 +4237,13 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link_default") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-then :
-  # 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'
+  $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,
 # so that the user can short-circuit this test for compilers unknown to
 # Autoconf.
@@ -4934,12 +4258,12 @@
 	# certainly right.
 	break;;
     *.* )
-	if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no;
+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
 	then :; else
 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
 	fi
 	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an '-o'
+	# safe: cross compilers may not add the suffix if given an `-o'
 	# argument, so we may need to know it at that point already.
 	# Even if this section looks crufty: it has the advantage of
 	# actually working.
@@ -4950,52 +4274,48 @@
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
-else case e in #(
-  e) ac_file='' ;;
-esac
+else
+  ac_file=''
 fi
-if test -z "$ac_file"
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-printf "%s\n" "$as_me: failed program was:" >&5
+if test -z "$ac_file"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
-See 'config.log' for more details" "$LINENO" 5; }
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-printf %s "checking for C compiler default output file name... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-printf "%s\n" "$ac_file" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-printf %s "checking for suffix of executables... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
 if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-then :
-  # 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
-# 'rm'.
+  $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
+# `rm'.
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
@@ -5005,16 +4325,15 @@
     * ) break;;
   esac
 done
-else case e in #(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See 'config.log' for more details" "$LINENO" 5; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-printf "%s\n" "$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -5023,11 +4342,9 @@
 /* end confdefs.h.  */
 #include <stdio.h>
 int
-main (void)
+main ()
 {
 FILE *f = fopen ("conftest.out", "w");
- if (!f)
-  return 1;
  return ferror (f) || fclose (f) != 0;
 
   ;
@@ -5037,8 +4354,8 @@
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-printf %s "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
   { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -5046,10 +4363,10 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_link") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
   if { ac_try='./conftest$ac_cv_exeext'
   { { case "(($ac_try" in
@@ -5057,41 +4374,39 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
-as_fn_error 77 "cannot run C compiled programs.
-If you meant to cross compile, use '--host'.
-See 'config.log' for more details" "$LINENO" 5; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-printf "%s\n" "$cross_compiling" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
 
-rm -f conftest.$ac_ext conftest$ac_cv_exeext \
-  conftest.o conftest.obj conftest.out
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-printf %s "checking for suffix of object files... " >&6; }
-if test ${ac_cv_objext+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
+if ${ac_cv_objext+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
@@ -5105,12 +4420,11 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compile") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-then :
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then :
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
@@ -5119,34 +4433,31 @@
        break;;
   esac
 done
-else case e in #(
-  e) printf "%s\n" "$as_me: failed program was:" >&5
+else
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See 'config.log' for more details" "$LINENO" 5; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
 fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext ;;
-esac
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-printf "%s\n" "$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
-printf %s "checking whether the compiler supports GNU C... " >&6; }
-if test ${ac_cv_c_compiler_gnu+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+if ${ac_cv_c_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 #ifndef __GNUC__
        choke me
@@ -5156,36 +4467,30 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
-else case e in #(
-  e) ac_compiler_gnu=no ;;
-esac
+else
+  ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
- ;;
-esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
 if test $ac_compiler_gnu = yes; then
   GCC=yes
 else
   GCC=
 fi
-ac_test_CFLAGS=${CFLAGS+y}
+ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-printf %s "checking whether $CC accepts -g... " >&6; }
-if test ${ac_cv_prog_cc_g+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_save_c_werror_flag=$ac_c_werror_flag
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
+if ${ac_cv_prog_cc_g+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_c_werror_flag=$ac_c_werror_flag
    ac_c_werror_flag=yes
    ac_cv_prog_cc_g=no
    CFLAGS="-g"
@@ -5193,63 +4498,57 @@
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
-else case e in #(
-  e) CFLAGS=""
+else
+  CFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-else case e in #(
-  e) ac_c_werror_flag=$ac_save_c_werror_flag
+else
+  ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ac_c_werror_flag=$ac_save_c_werror_flag ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_c_werror_flag=$ac_save_c_werror_flag
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
-if test $ac_test_CFLAGS; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
+if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
   if test "$GCC" = yes; then
@@ -5264,153 +4563,94 @@
     CFLAGS=
   fi
 fi
-ac_prog_cc_stdc=no
-if test x$ac_prog_cc_stdc = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
-printf %s "checking for $CC option to enable C11 features... " >&6; }
-if test ${ac_cv_prog_cc_c11+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cc_c11=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+if ${ac_cv_prog_cc_c89+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c89=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_c_conftest_c11_program
-_ACEOF
-for ac_arg in '' -std=gnu11
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_c11=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cc_c11" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC ;;
-esac
-fi
+#include <stdarg.h>
+#include <stdio.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
+struct buf { int x; };
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (p, i)
+     char **p;
+     int i;
+{
+  return p[i];
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+  char *s;
+  va_list v;
+  va_start (v,p);
+  s = g (p, va_arg (v,int));
+  va_end (v);
+  return s;
+}
 
-if test "x$ac_cv_prog_cc_c11" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cc_c11" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
-printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
-     CC="$CC $ac_cv_prog_cc_c11" ;;
-esac
-fi
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
-  ac_prog_cc_stdc=c11 ;;
-esac
-fi
-fi
-if test x$ac_prog_cc_stdc = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
-printf %s "checking for $CC option to enable C99 features... " >&6; }
-if test ${ac_cv_prog_cc_c99+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cc_c99=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_c_conftest_c99_program
-_ACEOF
-for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
-do
-  CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_prog_cc_c99=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cc_c99" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC ;;
-esac
-fi
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std is added to get
+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'==0 to get something
+   that's true only with -std.  */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 
-if test "x$ac_cv_prog_cc_c99" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cc_c99" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
-printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
-     CC="$CC $ac_cv_prog_cc_c99" ;;
-esac
-fi
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
-  ac_prog_cc_stdc=c99 ;;
-esac
-fi
-fi
-if test x$ac_prog_cc_stdc = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
-printf %s "checking for $CC option to enable C89 features... " >&6; }
-if test ${ac_cv_prog_cc_c89+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cc_c89=no
-ac_save_CC=$CC
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_c_conftest_c89_program
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+   inside strings and character constants.  */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
+  ;
+  return 0;
+}
 _ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
   CC="$ac_save_CC $ac_arg"
-  if ac_fn_c_try_compile "$LINENO"
-then :
+  if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_prog_cc_c89=$ac_arg
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
+rm -f core conftest.err conftest.$ac_objext
   test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
-CC=$ac_save_CC ;;
-esac
-fi
+CC=$ac_save_CC
 
-if test "x$ac_cv_prog_cc_c89" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cc_c89" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
-     CC="$CC $ac_cv_prog_cc_c89" ;;
-esac
 fi
-  ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
-  ac_prog_cc_stdc=c89 ;;
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c89"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
-fi
+if test "x$ac_cv_prog_cc_c89" != xno; then :
+
 fi
 
 ac_ext=c
@@ -5425,39 +4665,42 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-printf %s "checking how to run the C preprocessor... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test ${ac_cv_prog_CPP+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)     # Double quotes because $CC needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
     do
       ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <limits.h>
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
+if ac_fn_c_try_cpp "$LINENO"; then :
 
-else case e in #(
-  e) # Broken: fails on valid input.
-continue ;;
-esac
+else
+  # Broken: fails on valid input.
+continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -5467,56 +4710,56 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
-else case e in #(
-  e) # Passes both tests.
+else
+  # Passes both tests.
 ac_preproc_ok=:
-break ;;
-esac
+break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
+if $ac_preproc_ok; then :
   break
 fi
 
     done
     ac_cv_prog_CPP=$CPP
-   ;;
-esac
+
 fi
   CPP=$ac_cv_prog_CPP
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-printf "%s\n" "$CPP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <limits.h>
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
+if ac_fn_c_try_cpp "$LINENO"; then :
 
-else case e in #(
-  e) # Broken: fails on valid input.
-continue ;;
-esac
+else
+  # Broken: fails on valid input.
+continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -5526,30 +4769,26 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
-else case e in #(
-  e) # Passes both tests.
+else
+  # Passes both tests.
 ac_preproc_ok=:
-break ;;
-esac
+break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
+if $ac_preproc_ok; then :
 
-else case e in #(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See 'config.log' for more details" "$LINENO" 5; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -5559,192 +4798,230 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5
-printf %s "checking for egrep -e... " >&6; }
-if test ${ac_cv_path_EGREP_TRADITIONAL+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -z "$EGREP_TRADITIONAL"; then
-  ac_path_EGREP_TRADITIONAL_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_prog in grep ggrep
-   do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue
-# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found.
-  # Check for GNU $ac_path_EGREP_TRADITIONAL
-case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #(
-*GNU*)
-  ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;;
-#(
-*)
-  ac_count=0
-  printf %s 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl"
-    "$ac_path_EGREP_TRADITIONAL" -E 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL"
-      ac_path_EGREP_TRADITIONAL_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_TRADITIONAL_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then
-    :
-  fi
-else
-  ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL
-fi
-
-    if test "$ac_cv_path_EGREP_TRADITIONAL"
-then :
-  ac_cv_path_EGREP_TRADITIONAL="$ac_cv_path_EGREP_TRADITIONAL -E"
-else case e in #(
-  e) if test -z "$EGREP_TRADITIONAL"; then
-  ac_path_EGREP_TRADITIONAL_found=false
-  # Loop through the user's path and test for each of PROGNAME-LIST
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-do
-  IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    for ac_prog in egrep
-   do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext"
-      as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue
-# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found.
-  # Check for GNU $ac_path_EGREP_TRADITIONAL
-case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #(
-*GNU*)
-  ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;;
-#(
-*)
-  ac_count=0
-  printf %s 0123456789 >"conftest.in"
-  while :
-  do
-    cat "conftest.in" "conftest.in" >"conftest.tmp"
-    mv "conftest.tmp" "conftest.in"
-    cp "conftest.in" "conftest.nl"
-    printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl"
-    "$ac_path_EGREP_TRADITIONAL" 'EGR(EP|AC)_TRADITIONAL$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-    as_fn_arith $ac_count + 1 && ac_count=$as_val
-    if test $ac_count -gt ${ac_path_EGREP_TRADITIONAL_max-0}; then
-      # Best one so far, save it but keep looking for a better one
-      ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL"
-      ac_path_EGREP_TRADITIONAL_max=$ac_count
-    fi
-    # 10*(2^10) chars as input seems more than enough
-    test $ac_count -gt 10 && break
-  done
-  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-esac
-
-      $ac_path_EGREP_TRADITIONAL_found && break 3
-    done
-  done
-  done
-IFS=$as_save_IFS
-  if test -z "$ac_cv_path_EGREP_TRADITIONAL"; 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_TRADITIONAL=$EGREP_TRADITIONAL
-fi
- ;;
-esac
-fi ;;
-esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5
-printf "%s\n" "$ac_cv_path_EGREP_TRADITIONAL" >&6; }
- EGREP_TRADITIONAL=$ac_cv_path_EGREP_TRADITIONAL
-
 
   ICC="no"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for icc" >&5
-printf %s "checking for icc... " >&6; }
+  { $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_TRADITIONAL "^__INTEL_COMPILER" >/dev/null 2>&1
-then :
+  $EGREP "^__INTEL_COMPILER" >/dev/null 2>&1; then :
   ICC="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-else case e in #(
-  e) ICC="yes"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+else
+  ICC="yes"
     GCC="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
 fi
-rm -rf conftest*
+rm -f conftest*
 
 
 
   SUNCC="no"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suncc" >&5
-printf %s "checking for suncc... " >&6; }
+  { $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_TRADITIONAL "^__SUNPRO_C" >/dev/null 2>&1
-then :
+  $EGREP "^__SUNPRO_C" >/dev/null 2>&1; then :
   SUNCC="no"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-else case e in #(
-  e) SUNCC="yes"
+    { $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=""
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+rm -f conftest*
+
+
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
+$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
+if ${ac_cv_prog_cc_c99+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <wchar.h>
+#include <stdio.h>
+
+// Check varargs macros.  These examples are taken from C99 6.10.3.5.
+#define debug(...) fprintf (stderr, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+  int x = 1234;
+  int y = 5678;
+  debug ("Flag");
+  debug ("X = %d\n", x);
+  showlist (The first, second, and third items.);
+  report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+  your preprocessor is broken;
+#endif
+#if BIG_OK
+#else
+  your preprocessor is broken;
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+  int datasize;
+  double data[];
+};
+
+struct named_init {
+  int number;
+  const wchar_t *name;
+  double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+  // See if C++-style comments work.
+  // Iterate through items via the restricted pointer.
+  // Also check for declarations in for loops.
+  for (unsigned int i = 0; *(text+i) != '\0'; ++i)
+    continue;
+  return 0;
+}
+
+// Check varargs and va_copy.
+static void
+test_varargs (const char *format, ...)
+{
+  va_list args;
+  va_start (args, format);
+  va_list args_copy;
+  va_copy (args_copy, args);
+
+  const char *str;
+  int number;
+  float fnumber;
+
+  while (*format)
+    {
+      switch (*format++)
+	{
+	case 's': // string
+	  str = va_arg (args_copy, const char *);
+	  break;
+	case 'd': // int
+	  number = va_arg (args_copy, int);
+	  break;
+	case 'f': // float
+	  fnumber = va_arg (args_copy, double);
+	  break;
+	default:
+	  break;
+	}
+    }
+  va_end (args_copy);
+  va_end (args);
+}
+
+int
+main ()
+{
+
+  // Check bool.
+  _Bool success = false;
+
+  // Check restrict.
+  if (test_restrict ("String literal") == 0)
+    success = true;
+  char *restrict newvar = "Another string";
+
+  // Check varargs.
+  test_varargs ("s, d' f .", "string", 65, 34.234);
+  test_varargs_macros ();
+
+  // Check flexible array members.
+  struct incomplete_array *ia =
+    malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+  ia->datasize = 10;
+  for (int i = 0; i < ia->datasize; ++i)
+    ia->data[i] = i * 1.234;
+
+  // Check named initializers.
+  struct named_init ni = {
+    .number = 34,
+    .name = L"Test wide string",
+    .average = 543.34343,
+  };
+
+  ni.number = 58;
+
+  int dynamic_array[ni.number];
+  dynamic_array[ni.number - 1] = 543;
+
+  // work around unused variable warnings
+  return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x'
+	  || dynamic_array[ni.number - 1] != 543);
+
+  ;
+  return 0;
+}
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99
+do
+  CC="$ac_save_CC $ac_arg"
+  if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_prog_cc_c99=$ac_arg
 fi
-rm -rf conftest*
+rm -f core conftest.err conftest.$ac_objext
+  test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
 
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c99" in
+  x)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+  xno)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+  *)
+    CC="$CC $ac_cv_prog_cc_c99"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+$as_echo "$ac_cv_prog_cc_c99" >&6; } ;;
+esac
+if test "x$ac_cv_prog_cc_c99" != xno; then :
 
+fi
 
 
 ac_ext=c
@@ -5752,39 +5029,42 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
-printf %s "checking how to run the C preprocessor... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 fi
 if test -z "$CPP"; then
-  if test ${ac_cv_prog_CPP+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)     # Double quotes because $CC needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
+  if ${ac_cv_prog_CPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CPP needs to be expanded
+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
     do
       ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <limits.h>
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
+if ac_fn_c_try_cpp "$LINENO"; then :
 
-else case e in #(
-  e) # Broken: fails on valid input.
-continue ;;
-esac
+else
+  # Broken: fails on valid input.
+continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -5794,56 +5074,56 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
-else case e in #(
-  e) # Passes both tests.
+else
+  # Passes both tests.
 ac_preproc_ok=:
-break ;;
-esac
+break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
+if $ac_preproc_ok; then :
   break
 fi
 
     done
     ac_cv_prog_CPP=$CPP
-   ;;
-esac
+
 fi
   CPP=$ac_cv_prog_CPP
 else
   ac_cv_prog_CPP=$CPP
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-printf "%s\n" "$CPP" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <limits.h>
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 		     Syntax error
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
+if ac_fn_c_try_cpp "$LINENO"; then :
 
-else case e in #(
-  e) # Broken: fails on valid input.
-continue ;;
-esac
+else
+  # Broken: fails on valid input.
+continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -5853,30 +5133,26 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"
-then :
+if ac_fn_c_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
-else case e in #(
-  e) # Passes both tests.
+else
+  # Passes both tests.
 ac_preproc_ok=:
-break ;;
-esac
+break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
+if $ac_preproc_ok; then :
 
-else case e in #(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See 'config.log' for more details" "$LINENO" 5; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -5885,240 +5161,247 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-ac_header= ac_cache=
-for ac_item in $ac_header_c_list
-do
-  if test $ac_cache; then
-    ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
-    if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
-      printf "%s\n" "#define $ac_item 1" >> confdefs.h
-    fi
-    ac_header= ac_cache=
-  elif test $ac_header; then
-    ac_cache=$ac_item
-  else
-    ac_header=$ac_item
-  fi
-done
-
-
-
-
-
-
-
-
-if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
-then :
-
-printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-
-
-
-
-
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
-printf %s "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if test ${ac_cv_safe_to_define___extensions__+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
+if ${ac_cv_header_stdc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
 
-#         define __EXTENSIONS__ 1
-          $ac_includes_default
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_safe_to_define___extensions__=yes
-else case e in #(
-  e) ac_cv_safe_to_define___extensions__=no ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_header_stdc=yes
+else
+  ac_cv_header_stdc=no
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
-printf "%s\n" "$ac_cv_safe_to_define___extensions__" >&6; }
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether _XOPEN_SOURCE should be defined" >&5
-printf %s "checking whether _XOPEN_SOURCE should be defined... " >&6; }
-if test ${ac_cv_should_define__xopen_source+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_should_define__xopen_source=no
-    if test $ac_cv_header_wchar_h = yes
-then :
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#include <string.h>
 
-          #include <wchar.h>
-          mbstate_t x;
-int
-main (void)
-{
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "memchr" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdlib.h>
 
-  ;
-  return 0;
-}
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "free" >/dev/null 2>&1; then :
+
+else
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+  if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+#include <ctype.h>
+#include <stdlib.h>
+#if ((' ' & 0x0FF) == 0x020)
+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#else
+# define ISLOWER(c) \
+		   (('a' <= (c) && (c) <= 'i') \
+		     || ('j' <= (c) && (c) <= 'r') \
+		     || ('s' <= (c) && (c) <= 'z'))
+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
+#endif
 
-            #define _XOPEN_SOURCE 500
-            #include <wchar.h>
-            mbstate_t x;
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
 int
-main (void)
+main ()
 {
-
-  ;
+  int i;
+  for (i = 0; i < 256; i++)
+    if (XOR (islower (i), ISLOWER (i))
+	|| toupper (i) != TOUPPER (i))
+      return 2;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  ac_cv_should_define__xopen_source=yes
+if ac_fn_c_try_run "$LINENO"; then :
+
+else
+  ac_cv_header_stdc=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+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 conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi ;;
-esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_should_define__xopen_source" >&5
-printf "%s\n" "$ac_cv_should_define__xopen_source" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
 
-  printf "%s\n" "#define _ALL_SOURCE 1" >>confdefs.h
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
-  printf "%s\n" "#define _DARWIN_C_SOURCE 1" >>confdefs.h
+fi
 
-  printf "%s\n" "#define _GNU_SOURCE 1" >>confdefs.h
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
-  printf "%s\n" "#define _HPUX_ALT_XOPEN_SOCKET_API 1" >>confdefs.h
+fi
 
-  printf "%s\n" "#define _NETBSD_SOURCE 1" >>confdefs.h
+done
 
-  printf "%s\n" "#define _OPENBSD_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_ATTRIBS_EXT__ 1" >>confdefs.h
+  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
+if test "x$ac_cv_header_minix_config_h" = xyes; then :
+  MINIX=yes
+else
+  MINIX=
+fi
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_BFP_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_DFP_EXT__ 1" >>confdefs.h
+  if test "$MINIX" = yes; then
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_EXT__ 1" >>confdefs.h
+$as_echo "#define _POSIX_SOURCE 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_FUNCS_EXT__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_IEC_60559_TYPES_EXT__ 1" >>confdefs.h
+$as_echo "#define _POSIX_1_SOURCE 2" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_LIB_EXT2__ 1" >>confdefs.h
 
-  printf "%s\n" "#define __STDC_WANT_MATH_SPEC_FUNCS__ 1" >>confdefs.h
+$as_echo "#define _MINIX 1" >>confdefs.h
 
-  printf "%s\n" "#define _TANDEM_SOURCE 1" >>confdefs.h
+  fi
 
-  if test $ac_cv_header_minix_config_h = yes
-then :
-  MINIX=yes
-    printf "%s\n" "#define _MINIX 1" >>confdefs.h
 
-    printf "%s\n" "#define _POSIX_SOURCE 1" >>confdefs.h
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
+$as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
+if ${ac_cv_safe_to_define___extensions__+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
 
-    printf "%s\n" "#define _POSIX_1_SOURCE 2" >>confdefs.h
+#         define __EXTENSIONS__ 1
+          $ac_includes_default
+int
+main ()
+{
 
-else case e in #(
-  e) MINIX= ;;
-esac
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_safe_to_define___extensions__=yes
+else
+  ac_cv_safe_to_define___extensions__=no
 fi
-  if test $ac_cv_safe_to_define___extensions__ = yes
-then :
-  printf "%s\n" "#define __EXTENSIONS__ 1" >>confdefs.h
-
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-  if test $ac_cv_should_define__xopen_source = yes
-then :
-  printf "%s\n" "#define _XOPEN_SOURCE 500" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_define___extensions__" >&5
+$as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
+  test $ac_cv_safe_to_define___extensions__ = yes &&
+    $as_echo "#define __EXTENSIONS__ 1" >>confdefs.h
 
-fi
+  $as_echo "#define _ALL_SOURCE 1" >>confdefs.h
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-printf %s "checking whether ln -s works... " >&6; }
+  $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
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-printf "%s\n" "no, using $LN_S" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
 fi
 
 
 if test "$cross_compiling" = yes ; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for native build C compiler" >&5
-printf %s "checking for native build C compiler... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native build C compiler" >&5
+$as_echo_n "checking for native build C compiler... " >&6; }
   for ac_prog in gcc clang c99 c89 cc cl
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_BUILD_CC+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$BUILD_CC"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_BUILD_CC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$BUILD_CC"; then
   ac_cv_prog_BUILD_CC="$BUILD_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_BUILD_CC="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 BUILD_CC=$ac_cv_prog_BUILD_CC
 if test -n "$BUILD_CC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
-printf "%s\n" "$BUILD_CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
+$as_echo "$BUILD_CC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6126,8 +5409,8 @@
 done
 test -n "$BUILD_CC" || BUILD_CC="none"
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
-printf "%s\n" "$BUILD_CC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BUILD_CC" >&5
+$as_echo "$BUILD_CC" >&6; }
 else
   BUILD_CC=$CC
 fi
@@ -6135,25 +5418,23 @@
 
 php_with_libdir=lib
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for system library directory" >&5
-printf %s "checking for system library directory... " >&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+y}
-then :
+if test "${with_libdir+set}" = set; then :
   withval=$with_libdir; PHP_LIBDIR=$withval
-else case e in #(
-  e)
+else
+
   PHP_LIBDIR=lib
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_LIBDIR
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -6161,102 +5442,92 @@
 
 php_enable_rpath=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable runpaths" >&5
-printf %s "checking whether to enable runpaths... " >&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+y}
-then :
+if test "${enable_rpath+set}" = set; then :
   enableval=$enable_rpath; PHP_RPATH=$enableval
-else case e in #(
-  e)
+else
+
   PHP_RPATH=yes
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_RPATH
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&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 ${php_cv_cc_rpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler supports -Wl,-rpath," >&5
-printf %s "checking if compiler supports -Wl,-rpath,... " >&6; }
-if test ${php_cv_cc_rpath+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
   SAVE_LIBS=$LIBS
   LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   php_cv_cc_rpath=yes
-else case e in #(
-  e) php_cv_cc_rpath=no ;;
-esac
+else
+  php_cv_cc_rpath=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  LIBS=$SAVE_LIBS ;;
-esac
+  LIBS=$SAVE_LIBS
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_cc_rpath" >&5
-printf "%s\n" "$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
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler supports -R" >&5
-printf %s "checking if compiler supports -R... " >&6; }
-  if test ${php_cv_cc_dashr+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -R" >&5
+$as_echo_n "checking if compiler supports -R... " >&6; }
+  if ${php_cv_cc_dashr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     SAVE_LIBS=$LIBS
     LIBS="-R /usr/$PHP_LIBDIR $LIBS"
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   php_cv_cc_dashr=yes
-else case e in #(
-  e) php_cv_cc_dashr=no ;;
-esac
+else
+  php_cv_cc_dashr=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-    LIBS=$SAVE_LIBS ;;
-esac
+    LIBS=$SAVE_LIBS
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_cc_dashr" >&5
-printf "%s\n" "$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
@@ -6273,13 +5544,12 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_AWK+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$AWK"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AWK"; then
   ac_cv_prog_AWK="$AWK" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -6287,31 +5557,26 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-printf "%s\n" "$AWK" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6321,8 +5586,8 @@
 
   case "$AWK" in
     *mawk)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: mawk is known to have problems on some systems. You should install GNU awk" >&5
-printf "%s\n" "$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)
       ;;
@@ -6330,15 +5595,15 @@
       as_fn_error $? "Could not find awk; Install GNU awk" "$LINENO" 5
       ;;
     *)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $AWK is broken" >&5
-printf %s "checking if $AWK is broken... " >&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
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
         as_fn_error $? "You should install GNU awk" "$LINENO" 5
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       fi
       ;;
   esac
@@ -6349,44 +5614,38 @@
 
   # Extract the first word of "bison", so it can be a program name with args.
 set dummy bison; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_YACC+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$YACC"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_YACC+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_YACC="bison"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
-printf "%s\n" "$YACC" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
+$as_echo "$YACC" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6395,8 +5654,8 @@
   php_bison_excluded_versions='none'
 
   if test -n "$YACC"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bison version" >&5
-printf %s "checking for bison version... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bison version" >&5
+$as_echo_n "checking for bison version... " >&6; }
 
     php_bison_version=$($YACC --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | tr -d a-z)
     if test -z "$php_bison_version"; then
@@ -6438,11 +5697,11 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST YFLAGS"
 
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_bison_version (ok)" >&5
-printf "%s\n" "$php_bison_version (ok)" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_bison_version (ok)" >&5
+$as_echo "$php_bison_version (ok)" >&6; }
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_bison_version" >&5
-printf "%s\n" "$php_bison_version" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_bison_version" >&5
+$as_echo "$php_bison_version" >&6; }
     fi
   fi
 
@@ -6463,44 +5722,38 @@
 
   # Extract the first word of "re2c", so it can be a program name with args.
 set dummy re2c; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_RE2C+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$RE2C"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RE2C+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RE2C"; then
   ac_cv_prog_RE2C="$RE2C" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RE2C="re2c"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 RE2C=$ac_cv_prog_RE2C
 if test -n "$RE2C"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RE2C" >&5
-printf "%s\n" "$RE2C" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RE2C" >&5
+$as_echo "$RE2C" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -6508,8 +5761,8 @@
   php_re2c_required_version="0.13.4"
 
   if test -n "$RE2C"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for re2c version" >&5
-printf %s "checking for re2c version... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for re2c version" >&5
+$as_echo_n "checking for re2c version... " >&6; }
 
     php_re2c_version=$($RE2C --version | cut -d ' ' -f 2 2>/dev/null)
     if test -z "$php_re2c_version"; then
@@ -6536,11 +5789,11 @@
     fi
 
     if test "$php_re2c_check" != "invalid"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_re2c_version (ok)" >&5
-printf "%s\n" "$php_re2c_version (ok)" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_re2c_version (ok)" >&5
+$as_echo "$php_re2c_version (ok)" >&6; }
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_re2c_version" >&5
-printf "%s\n" "$php_re2c_version" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_re2c_version" >&5
+$as_echo "$php_re2c_version" >&6; }
     fi
   fi
 
@@ -6561,51 +5814,45 @@
 
   # Extract the first word of "php", so it can be a program name with args.
 set dummy php; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_PHP+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$PHP"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_PHP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$PHP"; then
   ac_cv_prog_PHP="$PHP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_PHP="php"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 PHP=$ac_cv_prog_PHP
 if test -n "$PHP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP" >&5
-printf "%s\n" "$PHP" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP" >&5
+$as_echo "$PHP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 
   if test -n "$PHP"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for php version" >&5
-printf %s "checking for php version... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for php version" >&5
+$as_echo_n "checking for php version... " >&6; }
     php_version=$($PHP -v | head -n1 | cut -d ' ' -f 2 | cut -d '-' -f 1)
     if test -z "$php_version"; then
       php_version=0.0.0
@@ -6615,12 +5862,12 @@
     IFS=$ac_IFS
     php_version_num=`expr ${1:-0} \* 10000 + ${2:-0} \* 100 + ${3:-0}`
         if test "$php_version_num" -lt 70400; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_version (too old)" >&5
-printf "%s\n" "$php_version (too old)" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_version (too old)" >&5
+$as_echo "$php_version (too old)" >&6; }
       unset PHP
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_version (ok)" >&5
-printf "%s\n" "$php_version (ok)" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_version (ok)" >&5
+$as_echo "$php_version (ok)" >&6; }
     fi
   fi
 
@@ -6631,24 +5878,22 @@
 
 php_enable_re2c_cgoto=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable computed goto gcc extension with re2c" >&5
-printf %s "checking whether to enable computed goto gcc extension with re2c... " >&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+y}
-then :
+if test "${enable_re2c_cgoto+set}" = set; then :
   enableval=$enable_re2c_cgoto; PHP_RE2C_CGOTO=$enableval
-else case e in #(
-  e)
+else
+
   PHP_RE2C_CGOTO=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_RE2C_CGOTO
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -6656,13 +5901,13 @@
 if test "$PHP_RE2C_CGOTO" = "no"; then
   RE2C_FLAGS=""
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether re2c -g works" >&5
-printf %s "checking whether re2c -g works... " >&6; }
+  { $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
-main (void)
+main ()
 {
 
 int main(int argc, const char **argv)
@@ -6680,22 +5925,20 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
     RE2C_FLAGS=""
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+else
 
-else case e in #(
-  e)
     RE2C_FLAGS="-g"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST RE2C_FLAGS"
@@ -6717,87 +5960,75 @@
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -ffp-contract=off" >&5
-printf %s "checking whether C compiler accepts -ffp-contract=off... " >&6; }
-if test ${ax_cv_check_cflags___ffp_contract_off+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -ffp-contract=off" >&5
+$as_echo_n "checking whether C compiler accepts -ffp-contract=off... " >&6; }
+if ${ax_cv_check_cflags___ffp_contract_off+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS  -ffp-contract=off"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags___ffp_contract_off=yes
-else case e in #(
-  e) ax_cv_check_cflags___ffp_contract_off=no ;;
-esac
+else
+  ax_cv_check_cflags___ffp_contract_off=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___ffp_contract_off" >&5
-printf "%s\n" "$ax_cv_check_cflags___ffp_contract_off" >&6; }
-if test "x$ax_cv_check_cflags___ffp_contract_off" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___ffp_contract_off" >&5
+$as_echo "$ax_cv_check_cflags___ffp_contract_off" >&6; }
+if test "x$ax_cv_check_cflags___ffp_contract_off" = xyes; then :
   CFLAGS="$CFLAGS -ffp-contract=off"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fvisibility=hidden" >&5
-printf %s "checking whether C compiler accepts -fvisibility=hidden... " >&6; }
-if test ${ax_cv_check_cflags___fvisibility_hidden+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fvisibility=hidden" >&5
+$as_echo_n "checking whether C compiler accepts -fvisibility=hidden... " >&6; }
+if ${ax_cv_check_cflags___fvisibility_hidden+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS  -fvisibility=hidden"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags___fvisibility_hidden=yes
-else case e in #(
-  e) ax_cv_check_cflags___fvisibility_hidden=no ;;
-esac
+else
+  ax_cv_check_cflags___fvisibility_hidden=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fvisibility_hidden" >&5
-printf "%s\n" "$ax_cv_check_cflags___fvisibility_hidden" >&6; }
-if test "x$ax_cv_check_cflags___fvisibility_hidden" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fvisibility_hidden" >&5
+$as_echo "$ax_cv_check_cflags___fvisibility_hidden" >&6; }
+if test "x$ax_cv_check_cflags___fvisibility_hidden" = xyes; then :
   CFLAGS="$CFLAGS -fvisibility=hidden"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
 
@@ -6818,45 +6049,45 @@
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to force non-PIC code in shared modules" >&5
-printf %s "checking whether to force non-PIC code in shared modules... " >&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
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
     ;;
   *)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are using musl libc" >&5
-printf %s "checking whether we are using musl libc... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using musl libc" >&5
+$as_echo_n "checking whether we are using musl libc... " >&6; }
 if command -v ldd >/dev/null && ldd --version 2>&1 | grep ^musl >/dev/null 2>&1
 then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define __MUSL__ 1" >>confdefs.h
+$as_echo "#define __MUSL__ 1" >>confdefs.h
 
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test "$ac_cv_safe_to_define___extensions__" = yes ; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use -D_GNU_SOURCE cflag" >&5
-printf %s "checking whether to use -D_GNU_SOURCE cflag... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use -D_GNU_SOURCE cflag" >&5
+$as_echo_n "checking whether to use -D_GNU_SOURCE cflag... " >&6; }
   CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 fi
 
 
@@ -6867,31 +6098,29 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether /dev/urandom exists" >&5
-printf %s "checking whether /dev/urandom exists... " >&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
 
-printf "%s\n" "#define HAVE_DEV_URANDOM 1" >>confdefs.h
+$as_echo "#define HAVE_DEV_URANDOM 1" >>confdefs.h
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 # Check whether --enable-gcc-global-regs was given.
-if test ${enable_gcc_global_regs+y}
-then :
+if test "${enable_gcc_global_regs+set}" = set; then :
   enableval=$enable_gcc_global_regs; ZEND_GCC_GLOBAL_REGS=$enableval
-else case e in #(
-  e) ZEND_GCC_GLOBAL_REGS=yes ;;
-esac
+else
+  ZEND_GCC_GLOBAL_REGS=yes
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for global register variables support" >&5
-printf %s "checking for global register variables support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for global register variables support" >&5
+$as_echo_n "checking for global register variables support... " >&6; }
 if test "$ZEND_GCC_GLOBAL_REGS" != "no"; then
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -6933,7 +6162,7 @@
 }
 
 int
-main (void)
+main ()
 {
 
 
@@ -6941,43 +6170,40 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
     ZEND_GCC_GLOBAL_REGS=yes
 
-else case e in #(
-  e)
+else
+
     ZEND_GCC_GLOBAL_REGS=no
-   ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 if test "$ZEND_GCC_GLOBAL_REGS" = "yes"; then
 
-printf "%s\n" "#define HAVE_GCC_GLOBAL_REGS 1" >>confdefs.h
+$as_echo "#define HAVE_GCC_GLOBAL_REGS 1" >>confdefs.h
 
 else
   HAVE_GCC_GLOBAL_REGS=no
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZEND_GCC_GLOBAL_REGS" >&5
-printf "%s\n" "$ZEND_GCC_GLOBAL_REGS" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZEND_GCC_GLOBAL_REGS" >&5
+$as_echo "$ZEND_GCC_GLOBAL_REGS" >&6; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __cpuid_count is available" >&5
+$as_echo_n "checking whether __cpuid_count is available... " >&6; }
+if ${ac_cv_cpuid_count_available+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether __cpuid_count is available" >&5
-printf %s "checking whether __cpuid_count is available... " >&6; }
-if test ${ac_cv_cpuid_count_available+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
   #include <cpuid.h>
 
 int
-main (void)
+main ()
 {
 
   unsigned eax, ebx, ecx, edx;
@@ -6987,39 +6213,35 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
   ac_cv_cpuid_count_available=yes
 
-else case e in #(
-  e)
+else
+
   ac_cv_cpuid_count_available=no
- ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpuid_count_available" >&5
-printf "%s\n" "$ac_cv_cpuid_count_available" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cpuid_count_available" >&5
+$as_echo "$ac_cv_cpuid_count_available" >&6; }
 if test "$ac_cv_cpuid_count_available" = "yes"; then
 
-printf "%s\n" "#define HAVE_CPUID_COUNT 1" >>confdefs.h
+$as_echo "#define HAVE_CPUID_COUNT 1" >>confdefs.h
 
 fi
 
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5
-printf %s "checking for pthreads_cflags... " >&6; }
-if test ${ac_cv_pthreads_cflags+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5
+$as_echo_n "checking for pthreads_cflags... " >&6; }
+if ${ac_cv_pthreads_cflags+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
 ac_cv_pthreads_cflags=
 if test "$pthreads_working" != "yes"; then
   for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do
@@ -7044,19 +6266,17 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
   pthreads_checked=yes
 
-else case e in #(
-  e)
+else
+
   pthreads_checked=no
 
- ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     CFLAGS=$ac_save
     if test "$pthreads_checked" = "yes"; then
@@ -7065,19 +6285,17 @@
     fi
   done
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags" >&5
-printf "%s\n" "$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; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5
+$as_echo_n "checking for pthreads_lib... " >&6; }
+if ${ac_cv_pthreads_lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5
-printf %s "checking for pthreads_lib... " >&6; }
-if test ${ac_cv_pthreads_lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
 ac_cv_pthreads_lib=
 if test "$pthreads_working" != "yes"; then
  for lib in pthread pthreads c_r; do
@@ -7102,19 +6320,17 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
   pthreads_checked=yes
 
-else case e in #(
-  e)
+else
+
   pthreads_checked=no
 
- ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_save
     if test "$pthreads_checked" = "yes"; then
@@ -7123,11 +6339,10 @@
     fi
   done
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_lib" >&5
-printf "%s\n" "$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 "x$ac_cv_pthreads_cflags" != "x" -o "x$ac_cv_pthreads_lib" != "x"; then
   pthreads_working="yes"
@@ -7135,8 +6350,7 @@
 
 
 # Check whether --enable- was given.
-if test ${enable_+y}
-then :
+if test "${enable_+set}" = set; then :
   enableval=$enable_;
 fi
 
@@ -7197,10 +6411,10 @@
 SAPI_LIBTOOL=libphp.la
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring SAPI modules${T_ME}" >&5
-printf "%s\n" "${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; }
 
 
 
@@ -7216,15 +6430,13 @@
 
 
 # Check whether --with-apxs2 was given.
-if test ${with_apxs2+y}
-then :
+if test "${with_apxs2+set}" = set; then :
   withval=$with_apxs2; PHP_APXS2=$withval
-else case e in #(
-  e)
+else
+
   PHP_APXS2=no
 
- ;;
-esac
+
 fi
 
 
@@ -7234,8 +6446,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Apache 2 handler module support via DSO through APXS" >&5
-printf %s "checking for Apache 2 handler module support via DSO through APXS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Apache 2 handler module support via DSO through APXS" >&5
+$as_echo_n "checking for Apache 2 handler module support via DSO through APXS... " >&6; }
 
 if test "$PHP_APXS2" != "no"; then
   if test "$PHP_APXS2" = "yes"; then
@@ -7260,24 +6472,24 @@
 
   $APXS -q CFLAGS >/dev/null 2>&1
   if test "$?" != "0"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Sorry, I cannot run apxs.  Possible reasons follow:" >&5
-printf "%s\n" "Sorry, I cannot run apxs.  Possible reasons follow:" >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: 1. Perl is not installed" >&5
-printf "%s\n" "1. Perl is not installed" >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: 2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&5
-printf "%s\n" "2. apxs was not found. Try to pass the path using --with-apxs2=/path/to/apxs" >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: 3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&5
-printf "%s\n" "3. Apache was not built using --enable-so (the apxs usage page is displayed)" >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: The output of $APXS follows:" >&5
-printf "%s\n" "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
     as_fn_error $? "Aborting" "$LINENO" 5
   fi
@@ -7869,14 +7081,14 @@
 
     fi
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST APXS"
 
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -7887,15 +7099,13 @@
 
 
 # Check whether --enable-cli was given.
-if test ${enable_cli+y}
-then :
+if test "${enable_cli+set}" = set; then :
   enableval=$enable_cli; PHP_CLI=$enableval
-else case e in #(
-  e)
+else
+
   PHP_CLI=yes
 
- ;;
-esac
+
 fi
 
 
@@ -7905,35 +7115,43 @@
 
 
 
-ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle"
-if test "x$ac_cv_func_setproctitle" = xyes
-then :
-  printf "%s\n" "#define HAVE_SETPROCTITLE 1" >>confdefs.h
+for ac_func in setproctitle
+do :
+  ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle"
+if test "x$ac_cv_func_setproctitle" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SETPROCTITLE 1
+_ACEOF
 
 fi
+done
 
 
-ac_fn_c_check_header_compile "$LINENO" "sys/pstat.h" "ac_cv_header_sys_pstat_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_pstat_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_PSTAT_H 1" >>confdefs.h
+for ac_header in sys/pstat.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/pstat.h" "ac_cv_header_sys_pstat_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_pstat_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_PSTAT_H 1
+_ACEOF
 
 fi
 
+done
+
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PS_STRINGS" >&5
-printf %s "checking for PS_STRINGS... " >&6; }
-if test ${cli_cv_var_PS_STRINGS+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PS_STRINGS" >&5
+$as_echo_n "checking for PS_STRINGS... " >&6; }
+if ${cli_cv_var_PS_STRINGS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <machine/vmparam.h>
 #include <sys/exec.h>
 
 int
-main (void)
+main ()
 {
 PS_STRINGS->ps_nargvstr = 1;
 PS_STRINGS->ps_argvstr = "foo";
@@ -7941,27 +7159,24 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   cli_cv_var_PS_STRINGS=yes
-else case e in #(
-  e) cli_cv_var_PS_STRINGS=no ;;
-esac
+else
+  cli_cv_var_PS_STRINGS=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cli_cv_var_PS_STRINGS" >&5
-printf "%s\n" "$cli_cv_var_PS_STRINGS" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cli_cv_var_PS_STRINGS" >&5
+$as_echo "$cli_cv_var_PS_STRINGS" >&6; }
 if test "$cli_cv_var_PS_STRINGS" = yes ; then
 
-printf "%s\n" "#define HAVE_PS_STRINGS /**/" >>confdefs.h
+$as_echo "#define HAVE_PS_STRINGS /**/" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CLI build" >&5
-printf %s "checking for CLI build... " >&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
@@ -8122,8 +7337,8 @@
 
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_CLI" >&5
-printf "%s\n" "$PHP_CLI" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_CLI" >&5
+$as_echo "$PHP_CLI" >&6; }
 
 
 
@@ -8133,15 +7348,13 @@
 
 
 # Check whether --enable-embed was given.
-if test ${enable_embed+y}
-then :
+if test "${enable_embed+set}" = set; then :
   enableval=$enable_embed; PHP_EMBED=$enableval
-else case e in #(
-  e)
+else
+
   PHP_EMBED=no
 
- ;;
-esac
+
 fi
 
 
@@ -8151,8 +7364,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for embedded SAPI library support" >&5
-printf %s "checking for embedded SAPI library support... " >&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
@@ -8355,11 +7568,11 @@
 
 
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_EMBED_TYPE" >&5
-printf "%s\n" "$PHP_EMBED_TYPE" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_EMBED_TYPE" >&5
+$as_echo "$PHP_EMBED_TYPE" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -8370,15 +7583,13 @@
 
 
 # Check whether --enable-fpm was given.
-if test ${enable_fpm+y}
-then :
+if test "${enable_fpm+set}" = set; then :
   enableval=$enable_fpm; PHP_FPM=$enableval
-else case e in #(
-  e)
+else
+
   PHP_FPM=no
 
- ;;
-esac
+
 fi
 
 
@@ -8418,304 +7629,267 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FPM build" >&5
-printf %s "checking for FPM build... " >&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
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_FPM" >&5
-printf "%s\n" "$PHP_FPM" >&6; }
-
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_FPM" >&5
+$as_echo "$PHP_FPM" >&6; }
 
-  ac_fn_c_check_func "$LINENO" "clearenv" "ac_cv_func_clearenv"
-if test "x$ac_cv_func_clearenv" = xyes
-then :
-  printf "%s\n" "#define HAVE_CLEARENV 1" >>confdefs.h
 
-fi
-ac_fn_c_check_func "$LINENO" "setproctitle" "ac_cv_func_setproctitle"
-if test "x$ac_cv_func_setproctitle" = xyes
-then :
-  printf "%s\n" "#define HAVE_SETPROCTITLE 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "setproctitle_fast" "ac_cv_func_setproctitle_fast"
-if test "x$ac_cv_func_setproctitle_fast" = xyes
-then :
-  printf "%s\n" "#define HAVE_SETPROCTITLE_FAST 1" >>confdefs.h
+  for ac_func in clearenv setproctitle setproctitle_fast
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
+done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
-printf %s "checking for library containing socket... " >&6; }
-if test ${ac_cv_search_socket+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_func_search_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
+$as_echo_n "checking for library containing socket... " >&6; }
+if ${ac_cv_search_socket+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* 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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char socket (void);
+char socket ();
 int
-main (void)
+main ()
 {
 return socket ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' socket
-do
+for ac_lib in '' socket; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"
-then :
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_socket=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_socket+y}
-then :
+  if ${ac_cv_search_socket+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_socket+y}
-then :
+if ${ac_cv_search_socket+:} false; then :
 
-else case e in #(
-  e) ac_cv_search_socket=no ;;
-esac
+else
+  ac_cv_search_socket=no
 fi
 rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS ;;
-esac
+LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
-printf "%s\n" "$ac_cv_search_socket" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_socket" >&5
+$as_echo "$ac_cv_search_socket" >&6; }
 ac_res=$ac_cv_search_socket
-if test "$ac_res" != no
-then :
+if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing inet_addr" >&5
-printf %s "checking for library containing inet_addr... " >&6; }
-if test ${ac_cv_search_inet_addr+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_func_search_save_LIBS=$LIBS
+  { $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 ${ac_cv_search_inet_addr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_func_search_save_LIBS=$LIBS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char inet_addr (void);
+char inet_addr ();
 int
-main (void)
+main ()
 {
 return inet_addr ();
   ;
   return 0;
 }
 _ACEOF
-for ac_lib in '' nsl
-do
+for ac_lib in '' nsl; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
     ac_res=-l$ac_lib
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
-  if ac_fn_c_try_link "$LINENO"
-then :
+  if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_search_inet_addr=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test ${ac_cv_search_inet_addr+y}
-then :
+  if ${ac_cv_search_inet_addr+:} false; then :
   break
 fi
 done
-if test ${ac_cv_search_inet_addr+y}
-then :
+if ${ac_cv_search_inet_addr+:} false; then :
 
-else case e in #(
-  e) ac_cv_search_inet_addr=no ;;
-esac
+else
+  ac_cv_search_inet_addr=no
 fi
 rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS ;;
-esac
+LIBS=$ac_func_search_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_inet_addr" >&5
-printf "%s\n" "$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
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for prctl" >&5
-printf %s "checking for prctl... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for prctl" >&5
+$as_echo_n "checking for prctl... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/prctl.h>
 int
-main (void)
+main ()
 {
 prctl(0, 0, 0, 0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define HAVE_PRCTL 1" >>confdefs.h
+$as_echo "#define HAVE_PRCTL 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for procctl" >&5
-printf %s "checking for procctl... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for procctl" >&5
+$as_echo_n "checking for procctl... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/procctl.h>
 int
-main (void)
+main ()
 {
 procctl(0, 0, 0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define HAVE_PROCCTL 1" >>confdefs.h
+$as_echo "#define HAVE_PROCCTL 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setpflags" >&5
-printf %s "checking for setpflags... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setpflags" >&5
+$as_echo_n "checking for setpflags... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <priv.h>
 int
-main (void)
+main ()
 {
 setpflags(0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define HAVE_SETPFLAGS 1" >>confdefs.h
+$as_echo "#define HAVE_SETPFLAGS 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
   have_clock_gettime=no
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_gettime" >&5
-printf %s "checking for clock_gettime... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime" >&5
+$as_echo_n "checking for clock_gettime... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
 int
-main (void)
+main ()
 {
 struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_clock_gettime=yes
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
   if test "$have_clock_gettime" = "no"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
-printf %s "checking for clock_gettime in -lrt... " >&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"
@@ -8724,50 +7898,47 @@
 /* end confdefs.h.  */
 #include <time.h>
 int
-main (void)
+main ()
 {
 struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
       have_clock_gettime=yes
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
       LIBS="$SAVED_LIBS"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-     ;;
-esac
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   fi
 
   if test "$have_clock_gettime" = "yes"; then
 
-printf "%s\n" "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
+$as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h
 
   fi
 
   have_clock_get_time=no
 
   if test "$have_clock_gettime" = "no"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clock_get_time" >&5
-printf %s "checking for clock_get_time... " >&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 :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (cross-compiling)" >&5
-printf "%s\n" "no (cross-compiling)" >&6; }
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no (cross-compiling)" >&5
+$as_echo "no (cross-compiling)" >&6; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <mach/mach.h>
       #include <mach/clock.h>
@@ -8791,30 +7962,27 @@
       }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
       have_clock_get_time=yes
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-     ;;
-esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   fi
 
   if test "$have_clock_get_time" = "yes"; then
 
-printf "%s\n" "#define HAVE_CLOCK_GET_TIME 1" >>confdefs.h
+$as_echo "#define HAVE_CLOCK_GET_TIME 1" >>confdefs.h
 
   fi
 
@@ -8822,8 +7990,8 @@
   have_ptrace=no
   have_broken_ptrace=no
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ptrace" >&5
-printf %s "checking for ptrace... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ptrace" >&5
+$as_echo_n "checking for ptrace... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8831,41 +7999,38 @@
     #include <sys/types.h>
     #include <sys/ptrace.h>
 int
-main (void)
+main ()
 {
 ptrace(0, 0, (void *) 0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
     have_ptrace=yes
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
   if test "$have_ptrace" = "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ptrace works" >&5
-printf %s "checking whether ptrace works... " >&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 :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: skipped (cross-compiling)" >&5
-printf "%s\n" "skipped (cross-compiling)" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipped (cross-compiling)" >&5
+$as_echo "skipped (cross-compiling)" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
       #include <unistd.h>
@@ -8936,39 +8101,36 @@
       }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
       have_ptrace=no
       have_broken_ptrace=yes
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-     ;;
-esac
+      { $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.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   fi
 
   if test "$have_ptrace" = "yes"; then
 
-printf "%s\n" "#define HAVE_PTRACE 1" >>confdefs.h
+$as_echo "#define HAVE_PTRACE 1" >>confdefs.h
 
   fi
 
   have_mach_vm_read=no
 
   if test "$have_broken_ptrace" = "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mach_vm_read" >&5
-printf %s "checking for mach_vm_read... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mach_vm_read" >&5
+$as_echo_n "checking for mach_vm_read... " >&6; }
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -8976,7 +8138,7 @@
       #include <mach/mach_vm.h>
 
 int
-main (void)
+main ()
 {
 
       mach_vm_read((vm_map_t)0, (mach_vm_address_t)0, (mach_vm_size_t)0, (vm_offset_t *)0, (mach_msg_type_number_t*)0);
@@ -8985,26 +8147,24 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
       have_mach_vm_read=yes
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-     ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   fi
 
   if test "$have_mach_vm_read" = "yes"; then
 
-printf "%s\n" "#define HAVE_MACH_VM_READ 1" >>confdefs.h
+$as_echo "#define HAVE_MACH_VM_READ 1" >>confdefs.h
 
   fi
 
@@ -9019,17 +8179,16 @@
   fi
 
   if test -n "$proc_mem_file" ; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for proc mem file" >&5
-printf %s "checking for proc mem file... " >&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 :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: skipped (cross-compiling)" >&5
-printf "%s\n" "skipped (cross-compiling)" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipped (cross-compiling)" >&5
+$as_echo "skipped (cross-compiling)" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
       #define _GNU_SOURCE
@@ -9059,30 +8218,29 @@
       }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $proc_mem_file" >&5
+$as_echo "$proc_mem_file" >&6; }
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $proc_mem_file" >&5
-printf "%s\n" "$proc_mem_file" >&6; }
+else
 
-else case e in #(
-  e)
       proc_mem_file=""
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-     ;;
-esac
+      { $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.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   fi
 
   if test -n "$proc_mem_file"; then
 
-printf "%s\n" "#define PROC_MEM_FILE \"$proc_mem_file\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PROC_MEM_FILE "$proc_mem_file"
+_ACEOF
 
   fi
 
@@ -9098,19 +8256,19 @@
     fpm_trace_type=mach
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: FPM Trace - ptrace, pread, or mach: could not be found" >&5
-printf "%s\n" "$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
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if gcc supports __sync_bool_compare_and_swap" >&5
-printf %s "checking if gcc supports __sync_bool_compare_and_swap... " >&6; }
+  { $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
-main (void)
+main ()
 {
 
     int variable = 1;
@@ -9121,207 +8279,195 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_BUILTIN_ATOMIC 1" >>confdefs.h
+$as_echo "#define HAVE_BUILTIN_ATOMIC 1" >>confdefs.h
 
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
   have_lq=no
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TCP_INFO" >&5
-printf %s "checking for TCP_INFO... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TCP_INFO" >&5
+$as_echo_n "checking for TCP_INFO... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <netinet/tcp.h>
 int
-main (void)
+main ()
 {
 struct tcp_info ti; int x = TCP_INFO;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
     have_lq=tcp_info
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
   if test "$have_lq" = "tcp_info"; then
 
-printf "%s\n" "#define HAVE_LQ_TCP_INFO 1" >>confdefs.h
+$as_echo "#define HAVE_LQ_TCP_INFO 1" >>confdefs.h
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TCP_CONNECTION_INFO" >&5
-printf %s "checking for TCP_CONNECTION_INFO... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TCP_CONNECTION_INFO" >&5
+$as_echo_n "checking for TCP_CONNECTION_INFO... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <netinet/tcp.h>
 int
-main (void)
+main ()
 {
 struct tcp_connection_info ti; int x = TCP_CONNECTION_INFO;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
     have_lq=tcp_connection_info
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
   if test "$have_lq" = "tcp_connection_info"; then
 
-printf "%s\n" "#define HAVE_LQ_TCP_CONNECTION_INFO 1" >>confdefs.h
+$as_echo "#define HAVE_LQ_TCP_CONNECTION_INFO 1" >>confdefs.h
 
   fi
 
   if test "$have_lq" = "no" ; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SO_LISTENQLEN" >&5
-printf %s "checking for SO_LISTENQLEN... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SO_LISTENQLEN" >&5
+$as_echo_n "checking for SO_LISTENQLEN... " >&6; }
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/socket.h>
 int
-main (void)
+main ()
 {
 int x = SO_LISTENQLIMIT; int y = SO_LISTENQLEN;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
       have_lq=so_listenq
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-     ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
     if test "$have_lq" = "tcp_info"; then
 
-printf "%s\n" "#define HAVE_LQ_SO_LISTENQ 1" >>confdefs.h
+$as_echo "#define HAVE_LQ_SO_LISTENQ 1" >>confdefs.h
 
     fi
   fi
 
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysconf" >&5
-printf %s "checking for sysconf... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysconf" >&5
+$as_echo_n "checking for sysconf... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <unistd.h>
 int
-main (void)
+main ()
 {
 sysconf(_SC_CLK_TCK);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define HAVE_SYSCONF 1" >>confdefs.h
+$as_echo "#define HAVE_SYSCONF 1" >>confdefs.h
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	 ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for times" >&5
-printf %s "checking for times... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for times" >&5
+$as_echo_n "checking for times... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/times.h>
 int
-main (void)
+main ()
 {
 struct tms t; times(&t);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define HAVE_TIMES 1" >>confdefs.h
+$as_echo "#define HAVE_TIMES 1" >>confdefs.h
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	 ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for kqueue" >&5
-printf %s "checking for kqueue... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kqueue" >&5
+$as_echo_n "checking for kqueue... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9331,7 +8477,7 @@
 		#include <sys/time.h>
 
 int
-main (void)
+main ()
 {
 
 		int kfd;
@@ -9344,27 +8490,25 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define HAVE_KQUEUE 1" >>confdefs.h
+$as_echo "#define HAVE_KQUEUE 1" >>confdefs.h
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	 ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for port framework" >&5
-printf %s "checking for port framework... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for port framework" >&5
+$as_echo_n "checking for port framework... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9372,7 +8516,7 @@
 		#include <port.h>
 
 int
-main (void)
+main ()
 {
 
 		int port;
@@ -9386,27 +8530,25 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define HAVE_PORT 1" >>confdefs.h
+$as_echo "#define HAVE_PORT 1" >>confdefs.h
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	 ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for /dev/poll" >&5
-printf %s "checking for /dev/poll... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for /dev/poll" >&5
+$as_echo_n "checking for /dev/poll... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9415,7 +8557,7 @@
 		#include <sys/devpoll.h>
 
 int
-main (void)
+main ()
 {
 
 		int n, dp;
@@ -9430,27 +8572,25 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define HAVE_DEVPOLL 1" >>confdefs.h
+$as_echo "#define HAVE_DEVPOLL 1" >>confdefs.h
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	 ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for epoll" >&5
-printf %s "checking for epoll... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for epoll" >&5
+$as_echo_n "checking for epoll... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9458,7 +8598,7 @@
 		#include <sys/epoll.h>
 
 int
-main (void)
+main ()
 {
 
 		int epollfd;
@@ -9485,27 +8625,25 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define HAVE_EPOLL 1" >>confdefs.h
+$as_echo "#define HAVE_EPOLL 1" >>confdefs.h
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	 ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for select" >&5
-printf %s "checking for select... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for select" >&5
+$as_echo_n "checking for select... " >&6; }
 
 	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9519,7 +8657,7 @@
 		#include <unistd.h>
 
 int
-main (void)
+main ()
 {
 
 		fd_set fds;
@@ -9535,23 +8673,21 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define HAVE_SELECT 1" >>confdefs.h
+$as_echo "#define HAVE_SELECT 1" >>confdefs.h
 
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	 ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
 
@@ -9560,15 +8696,13 @@
 
 
 # Check whether --with-fpm-user was given.
-if test ${with_fpm_user+y}
-then :
+if test "${with_fpm_user+set}" = set; then :
   withval=$with_fpm_user; PHP_FPM_USER=$withval
-else case e in #(
-  e)
+else
+
   PHP_FPM_USER=nobody
 
- ;;
-esac
+
 fi
 
 
@@ -9584,15 +8718,13 @@
 
 
 # Check whether --with-fpm-group was given.
-if test ${with_fpm_group+y}
-then :
+if test "${with_fpm_group+set}" = set; then :
   withval=$with_fpm_group; PHP_FPM_GROUP=$withval
-else case e in #(
-  e)
+else
+
   PHP_FPM_GROUP=nobody
 
- ;;
-esac
+
 fi
 
 
@@ -9608,15 +8740,13 @@
 
 
 # Check whether --with-fpm-systemd was given.
-if test ${with_fpm_systemd+y}
-then :
+if test "${with_fpm_systemd+set}" = set; then :
   withval=$with_fpm_systemd; PHP_FPM_SYSTEMD=$withval
-else case e in #(
-  e)
+else
+
   PHP_FPM_SYSTEMD=no
 
- ;;
-esac
+
 fi
 
 
@@ -9632,15 +8762,13 @@
 
 
 # Check whether --with-fpm-acl was given.
-if test ${with_fpm_acl+y}
-then :
+if test "${with_fpm_acl+set}" = set; then :
   withval=$with_fpm_acl; PHP_FPM_ACL=$withval
-else case e in #(
-  e)
+else
+
   PHP_FPM_ACL=no
 
- ;;
-esac
+
 fi
 
 
@@ -9656,15 +8784,13 @@
 
 
 # Check whether --with-fpm-apparmor was given.
-if test ${with_fpm_apparmor+y}
-then :
+if test "${with_fpm_apparmor+set}" = set; then :
   withval=$with_fpm_apparmor; PHP_FPM_APPARMOR=$withval
-else case e in #(
-  e)
+else
+
   PHP_FPM_APPARMOR=no
 
- ;;
-esac
+
 fi
 
 
@@ -9680,15 +8806,13 @@
 
 
 # Check whether --with-fpm-selinux was given.
-if test ${with_fpm_selinux+y}
-then :
+if test "${with_fpm_selinux+set}" = set; then :
   withval=$with_fpm_selinux; PHP_FPM_SELINUX=$withval
-else case e in #(
-  e)
+else
+
   PHP_FPM_SELINUX=no
 
- ;;
-esac
+
 fi
 
 
@@ -9701,17 +8825,17 @@
   if test "$PHP_FPM_SYSTEMD" != "no" ; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsystemd >= 209" >&5
-printf %s "checking for libsystemd >= 209... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsystemd >= 209" >&5
+$as_echo_n "checking for libsystemd >= 209... " >&6; }
 
 if test -n "$SYSTEMD_CFLAGS"; then
     pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd >= 209" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -9725,10 +8849,10 @@
     pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd >= 209\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsystemd >= 209") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd >= 209" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -9742,8 +8866,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -9769,10 +8893,10 @@
 and SYSTEMD_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -9782,33 +8906,34 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
 	SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
-           for ac_header in systemd/sd-daemon.h
+    for ac_header in systemd/sd-daemon.h
 do :
-  ac_fn_c_check_header_compile "$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" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYSTEMD_SD_DAEMON_H 1" >>confdefs.h
+  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" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYSTEMD_SD_DAEMON_H 1
+_ACEOF
  HAVE_SD_DAEMON_H="yes"
-else case e in #(
-  e) HAVE_SD_DAEMON_H="no" ;;
-esac
+else
+  HAVE_SD_DAEMON_H="no"
 fi
 
 done
+
     if test $HAVE_SD_DAEMON_H = "no"; then
       as_fn_error $? "Your system does not support systemd." "$LINENO" 5
     else
 
-printf "%s\n" "#define HAVE_SYSTEMD 1" >>confdefs.h
+$as_echo "#define HAVE_SYSTEMD 1" >>confdefs.h
 
       PHP_FPM_SD_FILES="fpm/fpm_systemd.c"
 
@@ -9939,15 +9064,20 @@
   fi
 
   if test "$PHP_FPM_ACL" != "no" ; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for acl user/group permissions support" >&5
-printf %s "checking for acl user/group permissions support... " >&6; }
-    ac_fn_c_check_header_compile "$LINENO" "sys/acl.h" "ac_cv_header_sys_acl_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_acl_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_ACL_H 1" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl user/group permissions support" >&5
+$as_echo_n "checking for acl user/group permissions support... " >&6; }
+    for ac_header in sys/acl.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/acl.h" "ac_cv_header_sys_acl_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_acl_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_ACL_H 1
+_ACEOF
 
 fi
 
+done
+
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -9966,54 +9096,45 @@
       }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for acl_free in -lacl" >&5
-printf %s "checking for acl_free in -lacl... " >&6; }
-if test ${ac_cv_lib_acl_acl_free+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_free in -lacl" >&5
+$as_echo_n "checking for acl_free in -lacl... " >&6; }
+if ${ac_cv_lib_acl_acl_free+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lacl  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char acl_free (void);
+char acl_free ();
 int
-main (void)
+main ()
 {
 return acl_free ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_acl_acl_free=yes
-else case e in #(
-  e) ac_cv_lib_acl_acl_free=no ;;
-esac
+else
+  ac_cv_lib_acl_acl_free=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_free" >&5
-printf "%s\n" "$ac_cv_lib_acl_acl_free" >&6; }
-if test "x$ac_cv_lib_acl_acl_free" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_free" >&5
+$as_echo "$ac_cv_lib_acl_acl_free" >&6; }
+if test "x$ac_cv_lib_acl_acl_free" = xyes; then :
 
 
   case acl in
@@ -10025,17 +9146,16 @@
 
 
           have_fpm_acl=yes
-          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
-          if test "$cross_compiling" = yes
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: skipped" >&5
-printf "%s\n" "skipped" >&6; }
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipped" >&5
+$as_echo "skipped" >&6; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/acl.h>
             int main(void)
@@ -10052,101 +9172,93 @@
             }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
             have_fpm_acl=yes
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
             have_fpm_acl=no
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-           ;;
-esac
+            { $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.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-         ;;
-esac
+
 fi
 
 
-else case e in #(
-  e)
+else
+
       have_fpm_acl=no
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-     ;;
-esac
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
     if test "$have_fpm_acl" = "yes"; then
 
-printf "%s\n" "#define HAVE_FPM_ACL 1" >>confdefs.h
+$as_echo "#define HAVE_FPM_ACL 1" >>confdefs.h
 
     fi
   fi
 
   if test "x$PHP_FPM_APPARMOR" != "xno" ; then
-    ac_fn_c_check_header_compile "$LINENO" "sys/apparmor.h" "ac_cv_header_sys_apparmor_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_apparmor_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_APPARMOR_H 1" >>confdefs.h
+    for ac_header in sys/apparmor.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/apparmor.h" "ac_cv_header_sys_apparmor_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_apparmor_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_APPARMOR_H 1
+_ACEOF
 
 fi
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for aa_change_profile in -lapparmor" >&5
-printf %s "checking for aa_change_profile in -lapparmor... " >&6; }
-if test ${ac_cv_lib_apparmor_aa_change_profile+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+done
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for aa_change_profile in -lapparmor" >&5
+$as_echo_n "checking for aa_change_profile in -lapparmor... " >&6; }
+if ${ac_cv_lib_apparmor_aa_change_profile+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lapparmor  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char aa_change_profile (void);
+char aa_change_profile ();
 int
-main (void)
+main ()
 {
 return aa_change_profile ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_apparmor_aa_change_profile=yes
-else case e in #(
-  e) ac_cv_lib_apparmor_aa_change_profile=no ;;
-esac
+else
+  ac_cv_lib_apparmor_aa_change_profile=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_apparmor_aa_change_profile" >&5
-printf "%s\n" "$ac_cv_lib_apparmor_aa_change_profile" >&6; }
-if test "x$ac_cv_lib_apparmor_aa_change_profile" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_apparmor_aa_change_profile" >&5
+$as_echo "$ac_cv_lib_apparmor_aa_change_profile" >&6; }
+if test "x$ac_cv_lib_apparmor_aa_change_profile" = xyes; then :
 
 
 
@@ -10159,71 +9271,67 @@
 
 
 
-printf "%s\n" "#define HAVE_APPARMOR 1" >>confdefs.h
+$as_echo "#define HAVE_APPARMOR 1" >>confdefs.h
+
 
+else
 
-else case e in #(
-  e)
       as_fn_error $? "libapparmor required but not found" "$LINENO" 5
-     ;;
-esac
+
 fi
 
   fi
 
   if test "x$PHP_FPM_SELINUX" != "xno" ; then
-    ac_fn_c_check_header_compile "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default"
-if test "x$ac_cv_header_selinux_selinux_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SELINUX_SELINUX_H 1" >>confdefs.h
+    for ac_header in selinux/selinux.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "selinux/selinux.h" "ac_cv_header_selinux_selinux_h" "$ac_includes_default"
+if test "x$ac_cv_header_selinux_selinux_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SELINUX_SELINUX_H 1
+_ACEOF
 
 fi
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for security_setenforce in -lselinux" >&5
-printf %s "checking for security_setenforce in -lselinux... " >&6; }
-if test ${ac_cv_lib_selinux_security_setenforce+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+done
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for security_setenforce in -lselinux" >&5
+$as_echo_n "checking for security_setenforce in -lselinux... " >&6; }
+if ${ac_cv_lib_selinux_security_setenforce+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lselinux  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char security_setenforce (void);
+char security_setenforce ();
 int
-main (void)
+main ()
 {
 return security_setenforce ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_selinux_security_setenforce=yes
-else case e in #(
-  e) ac_cv_lib_selinux_security_setenforce=no ;;
-esac
+else
+  ac_cv_lib_selinux_security_setenforce=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_security_setenforce" >&5
-printf "%s\n" "$ac_cv_lib_selinux_security_setenforce" >&6; }
-if test "x$ac_cv_lib_selinux_security_setenforce" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_security_setenforce" >&5
+$as_echo "$ac_cv_lib_selinux_security_setenforce" >&6; }
+if test "x$ac_cv_lib_selinux_security_setenforce" = xyes; then :
 
 
 
@@ -10236,7 +9344,7 @@
 
 
 
-printf "%s\n" "#define HAVE_SELINUX 1" >>confdefs.h
+$as_echo "#define HAVE_SELINUX 1" >>confdefs.h
 
 
 fi
@@ -10250,7 +9358,9 @@
 
 
 
-printf "%s\n" "#define PHP_FPM_SYSTEMD \"$php_fpm_systemd\"" >>confdefs.h
+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
@@ -10300,10 +9410,14 @@
 
 
 
-printf "%s\n" "#define PHP_FPM_USER \"$php_fpm_user\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_FPM_USER "$php_fpm_user"
+_ACEOF
 
 
-printf "%s\n" "#define PHP_FPM_GROUP \"$php_fpm_group\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_FPM_GROUP "$php_fpm_group"
+_ACEOF
 
 
 
@@ -10483,30 +9597,28 @@
 
 
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for clang fuzzer SAPI" >&5
-printf %s "checking for clang fuzzer SAPI... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clang fuzzer SAPI" >&5
+$as_echo_n "checking for clang fuzzer SAPI... " >&6; }
 
 
 php_enable_fuzzer=no
 
 
 # Check whether --enable-fuzzer was given.
-if test ${enable_fuzzer+y}
-then :
+if test "${enable_fuzzer+set}" = set; then :
   enableval=$enable_fuzzer; PHP_FUZZER=$enableval
-else case e in #(
-  e)
+else
+
   PHP_FUZZER=no
 
- ;;
-esac
+
 fi
 
 
@@ -10520,15 +9632,9 @@
 
 
 if test "$PHP_FUZZER" != "no"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
-
-
-
-
-
-
-ac_ext=cpp
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+    ac_ext=cpp
 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'
@@ -10538,48 +9644,42 @@
     CXX=$CCC
   else
     if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CXX+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$CXX"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-printf "%s\n" "$CXX" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -10588,48 +9688,42 @@
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CXX+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_CXX"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-printf "%s\n" "$ac_ct_CXX" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -10641,8 +9735,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -10652,7 +9746,7 @@
   fi
 fi
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -10662,7 +9756,7 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -10672,21 +9766,20 @@
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5
-printf %s "checking whether the compiler supports GNU C++... " >&6; }
-if test ${ac_cv_cxx_compiler_gnu+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 #ifndef __GNUC__
        choke me
@@ -10696,36 +9789,30 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
-else case e in #(
-  e) ac_compiler_gnu=no ;;
-esac
+else
+  ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- ;;
-esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; }
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
+fi
+{ $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+y}
+ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-printf %s "checking whether $CXX accepts -g... " >&6; }
-if test ${ac_cv_prog_cxx_g+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if ${ac_cv_prog_cxx_g+:} false; 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"
@@ -10733,63 +9820,57 @@
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
-else case e in #(
-  e) CXXFLAGS=""
+else
+  CXXFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
 
-else case e in #(
-  e) ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-printf "%s\n" "$ac_cv_prog_cxx_g" >&6; }
-if test $ac_test_CXXFLAGS; then
+{ $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
   if test "$GXX" = yes; then
@@ -10804,106 +9885,6 @@
     CXXFLAGS=
   fi
 fi
-ac_prog_cxx_stdcxx=no
-if test x$ac_prog_cxx_stdcxx = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
-printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx11+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cxx_cxx11=no
-ac_save_CXX=$CXX
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_cxx_conftest_cxx11_program
-_ACEOF
-for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA
-do
-  CXX="$ac_save_CXX $ac_arg"
-  if ac_fn_cxx_try_compile "$LINENO"
-then :
-  ac_cv_prog_cxx_cxx11=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cxx_cxx11" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CXX=$ac_save_CXX ;;
-esac
-fi
-
-if test "x$ac_cv_prog_cxx_cxx11" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cxx_cxx11" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5
-printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; }
-     CXX="$CXX $ac_cv_prog_cxx_cxx11" ;;
-esac
-fi
-  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11
-  ac_prog_cxx_stdcxx=cxx11 ;;
-esac
-fi
-fi
-if test x$ac_prog_cxx_stdcxx = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
-printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx98+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cxx_cxx98=no
-ac_save_CXX=$CXX
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_cxx_conftest_cxx98_program
-_ACEOF
-for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA
-do
-  CXX="$ac_save_CXX $ac_arg"
-  if ac_fn_cxx_try_compile "$LINENO"
-then :
-  ac_cv_prog_cxx_cxx98=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cxx_cxx98" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CXX=$ac_save_CXX ;;
-esac
-fi
-
-if test "x$ac_cv_prog_cxx_cxx98" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cxx_cxx98" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5
-printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; }
-     CXX="$CXX $ac_cv_prog_cxx_cxx98" ;;
-esac
-fi
-  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98
-  ac_prog_cxx_stdcxx=cxx98 ;;
-esac
-fi
-fi
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -10915,35 +9896,38 @@
 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
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-printf %s "checking how to run the C++ preprocessor... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
-  if test ${ac_cv_prog_CXXCPP+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)     # Double quotes because $CXX needs to be expanded
-    for CXXCPP in "$CXX -E" cpp /lib/cpp
+  if ${ac_cv_prog_CXXCPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
     do
       ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <limits.h>
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
-else case e in #(
-  e) # Broken: fails on valid input.
-continue ;;
-esac
+else
+  # Broken: fails on valid input.
+continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -10953,56 +9937,56 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
-else case e in #(
-  e) # Passes both tests.
+else
+  # Passes both tests.
 ac_preproc_ok=:
-break ;;
-esac
+break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
+if $ac_preproc_ok; then :
   break
 fi
 
     done
     ac_cv_prog_CXXCPP=$CXXCPP
-   ;;
-esac
+
 fi
   CXXCPP=$ac_cv_prog_CXXCPP
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-printf "%s\n" "$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
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <limits.h>
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
-else case e in #(
-  e) # Broken: fails on valid input.
-continue ;;
-esac
+else
+  # Broken: fails on valid input.
+continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -11012,30 +9996,26 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
-else case e in #(
-  e) # Passes both tests.
+else
+  # Passes both tests.
 ac_preproc_ok=:
-break ;;
-esac
+break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
+if $ac_preproc_ok; then :
 
-else case e in #(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See 'config.log' for more details" "$LINENO" 5; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -11057,50 +10037,44 @@
   if test -z "$LIB_FUZZING_ENGINE"; then
     FUZZING_LIB="-fsanitize=fuzzer"
     FUZZING_CC="$CC"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=fuzzer-no-link" >&5
-printf %s "checking whether C compiler accepts -fsanitize=fuzzer-no-link... " >&6; }
-if test ${ax_cv_check_cflags___fsanitize_fuzzer_no_link+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=fuzzer-no-link" >&5
+$as_echo_n "checking whether C compiler accepts -fsanitize=fuzzer-no-link... " >&6; }
+if ${ax_cv_check_cflags___fsanitize_fuzzer_no_link+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS  -fsanitize=fuzzer-no-link"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags___fsanitize_fuzzer_no_link=yes
-else case e in #(
-  e) ax_cv_check_cflags___fsanitize_fuzzer_no_link=no ;;
-esac
+else
+  ax_cv_check_cflags___fsanitize_fuzzer_no_link=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_fuzzer_no_link" >&5
-printf "%s\n" "$ax_cv_check_cflags___fsanitize_fuzzer_no_link" >&6; }
-if test "x$ax_cv_check_cflags___fsanitize_fuzzer_no_link" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_fuzzer_no_link" >&5
+$as_echo "$ax_cv_check_cflags___fsanitize_fuzzer_no_link" >&6; }
+if test "x$ax_cv_check_cflags___fsanitize_fuzzer_no_link" = xyes; then :
 
       CFLAGS="$CFLAGS -fsanitize=fuzzer-no-link"
       CXXFLAGS="$CXXFLAGS -fsanitize=fuzzer-no-link"
 
-else case e in #(
-  e)
+else
+
       as_fn_error $? "Compiler doesn't support -fsanitize=fuzzer-no-link" "$LINENO" 5
-     ;;
-esac
+
 fi
 
   else
@@ -11692,29 +10666,27 @@
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_FUZZER" >&5
-printf "%s\n" "$PHP_FUZZER" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_FUZZER" >&5
+$as_echo "$PHP_FUZZER" >&6; }
 
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LiteSpeed support" >&5
-printf %s "checking for LiteSpeed support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LiteSpeed support" >&5
+$as_echo_n "checking for LiteSpeed support... " >&6; }
 
 
 php_enable_litespeed=no
 
 
 # Check whether --enable-litespeed was given.
-if test ${enable_litespeed+y}
-then :
+if test "${enable_litespeed+set}" = set; then :
   enableval=$enable_litespeed; PHP_LITESPEED=$enableval
-else case e in #(
-  e)
+else
+
   PHP_LITESPEED=no
   test "$PHP_ENABLE_ALL" && PHP_LITESPEED=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -11872,8 +10844,8 @@
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_LITESPEED" >&5
-printf "%s\n" "$PHP_LITESPEED" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_LITESPEED" >&5
+$as_echo "$PHP_LITESPEED" >&6; }
 
 
 
@@ -11881,18 +10853,16 @@
 
 php_enable_phpdbg=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phpdbg support" >&5
-printf %s "checking for phpdbg support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for phpdbg support" >&5
+$as_echo_n "checking for phpdbg support... " >&6; }
 # Check whether --enable-phpdbg was given.
-if test ${enable_phpdbg+y}
-then :
+if test "${enable_phpdbg+set}" = set; then :
   enableval=$enable_phpdbg; PHP_PHPDBG=$enableval
-else case e in #(
-  e)
+else
+
   PHP_PHPDBG=yes
   test "$PHP_ENABLE_ALL" && PHP_PHPDBG=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -11918,8 +10888,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -11927,24 +10897,22 @@
 
 php_enable_phpdbg_debug=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phpdbg debug build" >&5
-printf %s "checking for phpdbg debug build... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for phpdbg debug build" >&5
+$as_echo_n "checking for phpdbg debug build... " >&6; }
 # Check whether --enable-phpdbg-debug was given.
-if test ${enable_phpdbg_debug+y}
-then :
+if test "${enable_phpdbg_debug+set}" = set; then :
   enableval=$enable_phpdbg_debug; PHP_PHPDBG_DEBUG=$enableval
-else case e in #(
-  e)
+else
+
   PHP_PHPDBG_DEBUG=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_PHPDBG_DEBUG
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -11952,132 +10920,129 @@
 
 php_enable_phpdbg_readline=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phpdbg readline support" >&5
-printf %s "checking for phpdbg readline support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for phpdbg readline support" >&5
+$as_echo_n "checking for phpdbg readline support... " >&6; }
 # Check whether --enable-phpdbg-readline was given.
-if test ${enable_phpdbg_readline+y}
-then :
+if test "${enable_phpdbg_readline+set}" = set; then :
   enableval=$enable_phpdbg_readline; PHP_PHPDBG_READLINE=$enableval
-else case e in #(
-  e)
+else
+
   PHP_PHPDBG_READLINE=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_PHPDBG_READLINE
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$BUILD_PHPDBG" = "" && test "$PHP_PHPDBG" != "no"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether termios.h defines TIOCGWINSZ" >&5
-printf %s "checking whether termios.h defines TIOCGWINSZ... " >&6; }
-if test ${ac_cv_sys_tiocgwinsz_in_termios_h+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether termios.h defines TIOCGWINSZ" >&5
+$as_echo_n "checking whether termios.h defines TIOCGWINSZ... " >&6; }
+if ${ac_cv_sys_tiocgwinsz_in_termios_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
+#include <sys/types.h>
 #include <termios.h>
-const int tiocgwinsz = TIOCGWINSZ;
+#ifdef TIOCGWINSZ
+  yes
+#endif
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "yes" >/dev/null 2>&1; then :
   ac_cv_sys_tiocgwinsz_in_termios_h=yes
-else case e in #(
-  e) ac_cv_sys_tiocgwinsz_in_termios_h=no ;;
-esac
+else
+  ac_cv_sys_tiocgwinsz_in_termios_h=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f conftest*
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_tiocgwinsz_in_termios_h" >&5
-printf "%s\n" "$ac_cv_sys_tiocgwinsz_in_termios_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_tiocgwinsz_in_termios_h" >&5
+$as_echo "$ac_cv_sys_tiocgwinsz_in_termios_h" >&6; }
 
 if test $ac_cv_sys_tiocgwinsz_in_termios_h != yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether sys/ioctl.h defines TIOCGWINSZ" >&5
-printf %s "checking whether sys/ioctl.h defines TIOCGWINSZ... " >&6; }
-if test ${ac_cv_sys_tiocgwinsz_in_sys_ioctl_h+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/ioctl.h defines TIOCGWINSZ" >&5
+$as_echo_n "checking whether sys/ioctl.h defines TIOCGWINSZ... " >&6; }
+if ${ac_cv_sys_tiocgwinsz_in_sys_ioctl_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-$ac_includes_default
+#include <sys/types.h>
 #include <sys/ioctl.h>
-const int tiocgwinsz = TIOCGWINSZ;
+#ifdef TIOCGWINSZ
+  yes
+#endif
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "yes" >/dev/null 2>&1; then :
   ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=yes
-else case e in #(
-  e) ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=no ;;
-esac
+else
+  ac_cv_sys_tiocgwinsz_in_sys_ioctl_h=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f conftest*
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&5
-printf "%s\n" "$ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&5
+$as_echo "$ac_cv_sys_tiocgwinsz_in_sys_ioctl_h" >&6; }
 
   if test $ac_cv_sys_tiocgwinsz_in_sys_ioctl_h = yes; then
 
-printf "%s\n" "#define GWINSZ_IN_SYS_IOCTL 1" >>confdefs.h
+$as_echo "#define GWINSZ_IN_SYS_IOCTL 1" >>confdefs.h
 
   fi
 fi
 
 
-printf "%s\n" "#define HAVE_PHPDBG 1" >>confdefs.h
+$as_echo "#define HAVE_PHPDBG 1" >>confdefs.h
 
 
   if test "$PHP_PHPDBG_DEBUG" != "no"; then
 
-printf "%s\n" "#define PHPDBG_DEBUG 1" >>confdefs.h
+$as_echo "#define PHPDBG_DEBUG 1" >>confdefs.h
 
   else
 
-printf "%s\n" "#define PHPDBG_DEBUG 0" >>confdefs.h
+$as_echo "#define PHPDBG_DEBUG 0" >>confdefs.h
 
   fi
 
   PHP_PHPDBG_CFLAGS="-D_GNU_SOURCE -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
   PHP_PHPDBG_FILES="phpdbg.c phpdbg_parser.c phpdbg_lexer.c phpdbg_prompt.c phpdbg_help.c phpdbg_break.c phpdbg_print.c phpdbg_bp.c phpdbg_list.c phpdbg_utils.c phpdbg_info.c phpdbg_cmd.c phpdbg_set.c phpdbg_frame.c phpdbg_watch.c phpdbg_btree.c phpdbg_sigsafe.c phpdbg_io.c phpdbg_out.c"
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phpdbg and readline integration" >&5
-printf %s "checking for phpdbg and readline integration... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for phpdbg and readline integration" >&5
+$as_echo_n "checking for phpdbg and readline integration... " >&6; }
   if test "$PHP_PHPDBG_READLINE" = "yes"; then
     if test "$PHP_READLINE" != "no" -o  "$PHP_LIBEDIT" != "no"; then
 
-printf "%s\n" "#define HAVE_PHPDBG_READLINE 1" >>confdefs.h
+$as_echo "#define HAVE_PHPDBG_READLINE 1" >>confdefs.h
 
   	  PHPDBG_EXTRA_LIBS="$PHP_READLINE_LIBS"
-  	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+  	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
   	else
-  	  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: readline is not available" >&5
-printf "%s\n" "readline is not available" >&6; }
+  	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: readline is not available" >&5
+$as_echo "readline is not available" >&6; }
     fi
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
-printf "%s\n" "disabled" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5
+$as_echo "disabled" >&6; }
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for userfaultfd faulting on write-protected memory support" >&5
-printf %s "checking for userfaultfd faulting on write-protected memory support... " >&6; }
-if test ${ac_cv_phpdbg_userfaultfd_writefault+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for userfaultfd faulting on write-protected memory support" >&5
+$as_echo_n "checking for userfaultfd faulting on write-protected memory support... " >&6; }
+if ${ac_cv_phpdbg_userfaultfd_writefault+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
     #include <linux/userfaultfd.h>
@@ -12086,31 +11051,27 @@
     #endif
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_phpdbg_userfaultfd_writefault=yes
-else case e in #(
-  e) ac_cv_phpdbg_userfaultfd_writefault=no ;;
-esac
+else
+  ac_cv_phpdbg_userfaultfd_writefault=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_phpdbg_userfaultfd_writefault" >&5
-printf "%s\n" "$ac_cv_phpdbg_userfaultfd_writefault" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_phpdbg_userfaultfd_writefault" >&5
+$as_echo "$ac_cv_phpdbg_userfaultfd_writefault" >&6; }
   if test "$ac_cv_phpdbg_userfaultfd_writefault" = "yes"; then
     if test "$enable_zts" != "yes"; then
       CFLAGS_SAVE="$CFLAGS"
       LIBS_SAVE="$LIBS"
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5
-printf %s "checking for pthreads_cflags... " >&6; }
-if test ${ac_cv_pthreads_cflags+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5
+$as_echo_n "checking for pthreads_cflags... " >&6; }
+if ${ac_cv_pthreads_cflags+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
 ac_cv_pthreads_cflags=
 if test "$pthreads_working" != "yes"; then
   for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do
@@ -12135,19 +11096,17 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
   pthreads_checked=yes
 
-else case e in #(
-  e)
+else
+
   pthreads_checked=no
 
- ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     CFLAGS=$ac_save
     if test "$pthreads_checked" = "yes"; then
@@ -12156,19 +11115,17 @@
     fi
   done
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags" >&5
-printf "%s\n" "$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; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5
+$as_echo_n "checking for pthreads_lib... " >&6; }
+if ${ac_cv_pthreads_lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5
-printf %s "checking for pthreads_lib... " >&6; }
-if test ${ac_cv_pthreads_lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
 ac_cv_pthreads_lib=
 if test "$pthreads_working" != "yes"; then
  for lib in pthread pthreads c_r; do
@@ -12193,19 +11150,17 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
   pthreads_checked=yes
 
-else case e in #(
-  e)
+else
+
   pthreads_checked=no
 
- ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_save
     if test "$pthreads_checked" = "yes"; then
@@ -12214,37 +11169,36 @@
     fi
   done
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_lib" >&5
-printf "%s\n" "$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 "x$ac_cv_pthreads_cflags" != "x" -o "x$ac_cv_pthreads_lib" != "x"; then
   pthreads_working="yes"
 fi
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking working pthreads" >&5
-printf %s "checking working pthreads... " >&6; };
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking working pthreads" >&5
+$as_echo_n "checking working pthreads... " >&6; };
 
       if test "$pthreads_working" = "yes"; then
-      	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags -l$ac_cv_pthreads_lib" >&5
-printf "%s\n" "$ac_cv_pthreads_cflags -l$ac_cv_pthreads_lib" >&6; };
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags -l$ac_cv_pthreads_lib" >&5
+$as_echo "$ac_cv_pthreads_cflags -l$ac_cv_pthreads_lib" >&6; };
       	PHP_PHPDBG_CFLAGS="$PHP_PHPDBG_CFLAGS $ac_cv_pthreads_cflags"
       	PHPDBG_EXTRA_LIBS="$PHPDBG_EXTRA_LIBS -l$ac_cv_pthreads_lib"
 
-printf "%s\n" "#define HAVE_USERFAULTFD_WRITEFAULT 1" >>confdefs.h
+$as_echo "#define HAVE_USERFAULTFD_WRITEFAULT 1" >>confdefs.h
 
       else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: pthreads not available" >&5
-printf "%s\n" "$as_me: WARNING: pthreads not available" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: pthreads not available" >&5
+$as_echo "$as_me: WARNING: pthreads not available" >&2;}
       fi
 
       CFLAGS="$CFLAGS_SAVE"
       LIBS="$LIBS_SAVE"
     else
 
-printf "%s\n" "#define HAVE_USERFAULTFD_WRITEFAULT 1" >>confdefs.h
+$as_echo "#define HAVE_USERFAULTFD_WRITEFAULT 1" >>confdefs.h
 
     fi
   fi
@@ -12415,15 +11369,13 @@
 
 
 # Check whether --enable-cgi was given.
-if test ${enable_cgi+y}
-then :
+if test "${enable_cgi+set}" = set; then :
   enableval=$enable_cgi; PHP_CGI=$enableval
-else case e in #(
-  e)
+else
+
   PHP_CGI=yes
 
- ;;
-esac
+
 fi
 
 
@@ -12433,48 +11385,46 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CGI build" >&5
-printf %s "checking for CGI build... " >&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
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sun_len in sys/un.h" >&5
-printf %s "checking for sun_len in sys/un.h... " >&6; }
+    { $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_TRADITIONAL "sun_len" >/dev/null 2>&1
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  $EGREP "sun_len" >/dev/null 2>&1; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_SOCKADDR_UN_SUN_LEN 1" >>confdefs.h
+$as_echo "#define HAVE_SOCKADDR_UN_SUN_LEN 1" >>confdefs.h
 
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; } ;;
-esac
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
-rm -rf conftest*
+rm -f conftest*
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether cross-process locking is required by accept()" >&5
-printf %s "checking whether cross-process locking is required by accept()... " >&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)
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define USE_LOCKING 1" >>confdefs.h
+$as_echo "#define USE_LOCKING 1" >>confdefs.h
 
       ;;
       *)
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       ;;
     esac
 
@@ -12620,25 +11570,25 @@
   PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES sapi/cgi/php-cgi.1"
 
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for chosen SAPI module" >&5
-printf %s "checking for chosen SAPI module... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_SAPI" >&5
-printf "%s\n" "$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; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for executable SAPI binaries" >&5
-printf %s "checking for executable SAPI binaries... " >&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
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_BINARIES" >&5
-printf "%s\n" "$PHP_BINARIES" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_BINARIES" >&5
+$as_echo "$PHP_BINARIES" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
-printf "%s\n" "none" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
 fi
 
 if test -z "$PHP_INSTALLED_SAPIS"; then
@@ -12685,23 +11635,22 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Running system checks${T_ME}" >&5
-printf "%s\n" "${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
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_PROG_SENDMAIL+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) case $PROG_SENDMAIL in
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PROG_SENDMAIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PROG_SENDMAIL in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_PROG_SENDMAIL="$PROG_SENDMAIL" # Let the user override the test with a path.
   ;;
@@ -12711,15 +11660,11 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_PROG_SENDMAIL="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_PROG_SENDMAIL="$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
@@ -12728,16 +11673,15 @@
 
   test -z "$ac_cv_path_PROG_SENDMAIL" && ac_cv_path_PROG_SENDMAIL="/usr/sbin/sendmail"
   ;;
-esac ;;
 esac
 fi
 PROG_SENDMAIL=$ac_cv_path_PROG_SENDMAIL
 if test -n "$PROG_SENDMAIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PROG_SENDMAIL" >&5
-printf "%s\n" "$PROG_SENDMAIL" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PROG_SENDMAIL" >&5
+$as_echo "$PROG_SENDMAIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -12747,20 +11691,18 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether system uses EBCDIC" >&5
-printf %s "checking whether system uses EBCDIC... " >&6; }
-if test ${ac_cv_ebcdic+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-  if test "$cross_compiling" = yes
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system uses EBCDIC" >&5
+$as_echo_n "checking whether system uses EBCDIC... " >&6; }
+if ${ac_cv_ebcdic+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  if test "$cross_compiling" = yes; then :
 
   ac_cv_ebcdic=no
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int main(void) {
@@ -12768,44 +11710,38 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_ebcdic=yes
 
-else case e in #(
-  e)
+else
+
   ac_cv_ebcdic=no
- ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ebcdic" >&5
-printf "%s\n" "$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
     as_fn_error $? "PHP does not support EBCDIC targets" "$LINENO" 5
   fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-printf %s "checking whether byte ordering is bigendian... " >&6; }
-if test ${ac_cv_c_bigendian_php+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
+if ${ac_cv_c_bigendian_php+:} false; 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 case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int main(void)
@@ -12821,40 +11757,34 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_c_bigendian_php=yes
-else case e in #(
-  e) ac_cv_c_bigendian_php=no ;;
-esac
+else
+  ac_cv_c_bigendian_php=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-  ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian_php" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define WORDS_BIGENDIAN /**/" >>confdefs.h
+$as_echo "#define WORDS_BIGENDIAN /**/" >>confdefs.h
 
  fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether writing to stdout works" >&5
-printf %s "checking whether writing to stdout works... " >&6; }
-if test ${ac_cv_write_stdout+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-    if test "$cross_compiling" = yes
-then :
+  { $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 ${ac_cv_write_stdout+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    if test "$cross_compiling" = yes; then :
 
       case $host_alias in
         *linux*)
@@ -12865,8 +11795,8 @@
           ;;
       esac
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef HAVE_UNISTD_H
@@ -12884,30 +11814,26 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
       ac_cv_write_stdout=yes
 
-else case e in #(
-  e)
+else
+
       ac_cv_write_stdout=no
-     ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-   ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_write_stdout" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define PHP_WRITE_STDOUT 1" >>confdefs.h
+$as_echo "#define PHP_WRITE_STDOUT 1" >>confdefs.h
 
   fi
 
@@ -12958,27 +11884,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
-if test "x$ac_cv_func_socket" = xyes
-then :
+if test "x$ac_cv_func_socket" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__socket" "ac_cv_func___socket"
-if test "x$ac_cv_func___socket" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__socket" "ac_cv_func___socket"
+if test "x$ac_cv_func___socket" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_SOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_SOCKET 1" >>confdefs.h
 
     ac_cv_func_socket=yes
   ;;
@@ -12988,140 +11910,118 @@
   unset ac_cv_lib_socket_socket
   unset ac_cv_lib_socket___socket
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
-printf %s "checking for socket in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket_socket+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
+$as_echo_n "checking for socket in -lsocket... " >&6; }
+if ${ac_cv_lib_socket_socket+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char socket (void);
+char socket ();
 int
-main (void)
+main ()
 {
 return socket ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_socket=yes
-else case e in #(
-  e) ac_cv_lib_socket_socket=no ;;
-esac
+else
+  ac_cv_lib_socket_socket=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
-printf "%s\n" "$ac_cv_lib_socket_socket" >&6; }
-if test "x$ac_cv_lib_socket_socket" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
+$as_echo "$ac_cv_lib_socket_socket" >&6; }
+if test "x$ac_cv_lib_socket_socket" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __socket in -lsocket" >&5
-printf %s "checking for __socket in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket___socket+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __socket in -lsocket" >&5
+$as_echo_n "checking for __socket in -lsocket... " >&6; }
+if ${ac_cv_lib_socket___socket+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __socket (void);
+char __socket ();
 int
-main (void)
+main ()
 {
 return __socket ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___socket=yes
-else case e in #(
-  e) ac_cv_lib_socket___socket=no ;;
-esac
+else
+  ac_cv_lib_socket___socket=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___socket" >&5
-printf "%s\n" "$ac_cv_lib_socket___socket" >&6; }
-if test "x$ac_cv_lib_socket___socket" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___socket" >&5
+$as_echo "$ac_cv_lib_socket___socket" >&6; }
+if test "x$ac_cv_lib_socket___socket" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -13139,10 +12039,10 @@
 
 
 
-printf "%s\n" "#define HAVE_SOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_SOCKET 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_socket=yes
   else
@@ -13151,140 +12051,118 @@
   unset ac_cv_lib_network_socket
   unset ac_cv_lib_network___socket
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socket in -lnetwork" >&5
-printf %s "checking for socket in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network_socket+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lnetwork" >&5
+$as_echo_n "checking for socket in -lnetwork... " >&6; }
+if ${ac_cv_lib_network_socket+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char socket (void);
+char socket ();
 int
-main (void)
+main ()
 {
 return socket ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network_socket=yes
-else case e in #(
-  e) ac_cv_lib_network_socket=no ;;
-esac
+else
+  ac_cv_lib_network_socket=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socket" >&5
-printf "%s\n" "$ac_cv_lib_network_socket" >&6; }
-if test "x$ac_cv_lib_network_socket" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socket" >&5
+$as_echo "$ac_cv_lib_network_socket" >&6; }
+if test "x$ac_cv_lib_network_socket" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __socket in -lnetwork" >&5
-printf %s "checking for __socket in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network___socket+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __socket in -lnetwork" >&5
+$as_echo_n "checking for __socket in -lnetwork... " >&6; }
+if ${ac_cv_lib_network___socket+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __socket (void);
+char __socket ();
 int
-main (void)
+main ()
 {
 return __socket ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network___socket=yes
-else case e in #(
-  e) ac_cv_lib_network___socket=no ;;
-esac
+else
+  ac_cv_lib_network___socket=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___socket" >&5
-printf "%s\n" "$ac_cv_lib_network___socket" >&6; }
-if test "x$ac_cv_lib_network___socket" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___socket" >&5
+$as_echo "$ac_cv_lib_network___socket" >&6; }
+if test "x$ac_cv_lib_network___socket" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnetwork"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -13302,10 +12180,10 @@
 
 
 
-printf "%s\n" "#define HAVE_SOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_SOCKET 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBNETWORK 1" >>confdefs.h
+$as_echo "#define HAVE_LIBNETWORK 1" >>confdefs.h
 
     ac_cv_func_socket=yes
   else
@@ -13327,27 +12205,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "socketpair" "ac_cv_func_socketpair"
-if test "x$ac_cv_func_socketpair" = xyes
-then :
+if test "x$ac_cv_func_socketpair" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__socketpair" "ac_cv_func___socketpair"
-if test "x$ac_cv_func___socketpair" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__socketpair" "ac_cv_func___socketpair"
+if test "x$ac_cv_func___socketpair" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_SOCKETPAIR 1" >>confdefs.h
+$as_echo "#define HAVE_SOCKETPAIR 1" >>confdefs.h
 
     ac_cv_func_socketpair=yes
   ;;
@@ -13357,140 +12231,118 @@
   unset ac_cv_lib_socket_socketpair
   unset ac_cv_lib_socket___socketpair
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socketpair in -lsocket" >&5
-printf %s "checking for socketpair in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket_socketpair+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socketpair in -lsocket" >&5
+$as_echo_n "checking for socketpair in -lsocket... " >&6; }
+if ${ac_cv_lib_socket_socketpair+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char socketpair (void);
+char socketpair ();
 int
-main (void)
+main ()
 {
 return socketpair ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_socketpair=yes
-else case e in #(
-  e) ac_cv_lib_socket_socketpair=no ;;
-esac
+else
+  ac_cv_lib_socket_socketpair=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socketpair" >&5
-printf "%s\n" "$ac_cv_lib_socket_socketpair" >&6; }
-if test "x$ac_cv_lib_socket_socketpair" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __socketpair in -lsocket" >&5
-printf %s "checking for __socketpair in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket___socketpair+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __socketpair in -lsocket" >&5
+$as_echo_n "checking for __socketpair in -lsocket... " >&6; }
+if ${ac_cv_lib_socket___socketpair+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __socketpair (void);
+char __socketpair ();
 int
-main (void)
+main ()
 {
 return __socketpair ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___socketpair=yes
-else case e in #(
-  e) ac_cv_lib_socket___socketpair=no ;;
-esac
+else
+  ac_cv_lib_socket___socketpair=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___socketpair" >&5
-printf "%s\n" "$ac_cv_lib_socket___socketpair" >&6; }
-if test "x$ac_cv_lib_socket___socketpair" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -13508,10 +12360,10 @@
 
 
 
-printf "%s\n" "#define HAVE_SOCKETPAIR 1" >>confdefs.h
+$as_echo "#define HAVE_SOCKETPAIR 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_socketpair=yes
   else
@@ -13520,140 +12372,118 @@
   unset ac_cv_lib_network_socketpair
   unset ac_cv_lib_network___socketpair
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for socketpair in -lnetwork" >&5
-printf %s "checking for socketpair in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network_socketpair+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socketpair in -lnetwork" >&5
+$as_echo_n "checking for socketpair in -lnetwork... " >&6; }
+if ${ac_cv_lib_network_socketpair+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char socketpair (void);
+char socketpair ();
 int
-main (void)
+main ()
 {
 return socketpair ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network_socketpair=yes
-else case e in #(
-  e) ac_cv_lib_network_socketpair=no ;;
-esac
+else
+  ac_cv_lib_network_socketpair=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socketpair" >&5
-printf "%s\n" "$ac_cv_lib_network_socketpair" >&6; }
-if test "x$ac_cv_lib_network_socketpair" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_socketpair" >&5
+$as_echo "$ac_cv_lib_network_socketpair" >&6; }
+if test "x$ac_cv_lib_network_socketpair" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __socketpair in -lnetwork" >&5
-printf %s "checking for __socketpair in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network___socketpair+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __socketpair in -lnetwork" >&5
+$as_echo_n "checking for __socketpair in -lnetwork... " >&6; }
+if ${ac_cv_lib_network___socketpair+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __socketpair (void);
+char __socketpair ();
 int
-main (void)
+main ()
 {
 return __socketpair ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network___socketpair=yes
-else case e in #(
-  e) ac_cv_lib_network___socketpair=no ;;
-esac
+else
+  ac_cv_lib_network___socketpair=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___socketpair" >&5
-printf "%s\n" "$ac_cv_lib_network___socketpair" >&6; }
-if test "x$ac_cv_lib_network___socketpair" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___socketpair" >&5
+$as_echo "$ac_cv_lib_network___socketpair" >&6; }
+if test "x$ac_cv_lib_network___socketpair" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnetwork"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -13671,10 +12501,10 @@
 
 
 
-printf "%s\n" "#define HAVE_SOCKETPAIR 1" >>confdefs.h
+$as_echo "#define HAVE_SOCKETPAIR 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBNETWORK 1" >>confdefs.h
+$as_echo "#define HAVE_LIBNETWORK 1" >>confdefs.h
 
     ac_cv_func_socketpair=yes
   else
@@ -13696,27 +12526,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "htonl" "ac_cv_func_htonl"
-if test "x$ac_cv_func_htonl" = xyes
-then :
+if test "x$ac_cv_func_htonl" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__htonl" "ac_cv_func___htonl"
-if test "x$ac_cv_func___htonl" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__htonl" "ac_cv_func___htonl"
+if test "x$ac_cv_func___htonl" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_HTONL 1" >>confdefs.h
+$as_echo "#define HAVE_HTONL 1" >>confdefs.h
 
     ac_cv_func_htonl=yes
   ;;
@@ -13726,140 +12552,118 @@
   unset ac_cv_lib_socket_htonl
   unset ac_cv_lib_socket___htonl
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for htonl in -lsocket" >&5
-printf %s "checking for htonl in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket_htonl+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htonl in -lsocket" >&5
+$as_echo_n "checking for htonl in -lsocket... " >&6; }
+if ${ac_cv_lib_socket_htonl+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char htonl (void);
+char htonl ();
 int
-main (void)
+main ()
 {
 return htonl ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_htonl=yes
-else case e in #(
-  e) ac_cv_lib_socket_htonl=no ;;
-esac
+else
+  ac_cv_lib_socket_htonl=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_htonl" >&5
-printf "%s\n" "$ac_cv_lib_socket_htonl" >&6; }
-if test "x$ac_cv_lib_socket_htonl" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __htonl in -lsocket" >&5
-printf %s "checking for __htonl in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket___htonl+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __htonl in -lsocket" >&5
+$as_echo_n "checking for __htonl in -lsocket... " >&6; }
+if ${ac_cv_lib_socket___htonl+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __htonl (void);
+char __htonl ();
 int
-main (void)
+main ()
 {
 return __htonl ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___htonl=yes
-else case e in #(
-  e) ac_cv_lib_socket___htonl=no ;;
-esac
+else
+  ac_cv_lib_socket___htonl=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___htonl" >&5
-printf "%s\n" "$ac_cv_lib_socket___htonl" >&6; }
-if test "x$ac_cv_lib_socket___htonl" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -13877,10 +12681,10 @@
 
 
 
-printf "%s\n" "#define HAVE_HTONL 1" >>confdefs.h
+$as_echo "#define HAVE_HTONL 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_htonl=yes
   else
@@ -13889,140 +12693,118 @@
   unset ac_cv_lib_network_htonl
   unset ac_cv_lib_network___htonl
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for htonl in -lnetwork" >&5
-printf %s "checking for htonl in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network_htonl+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htonl in -lnetwork" >&5
+$as_echo_n "checking for htonl in -lnetwork... " >&6; }
+if ${ac_cv_lib_network_htonl+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char htonl (void);
+char htonl ();
 int
-main (void)
+main ()
 {
 return htonl ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network_htonl=yes
-else case e in #(
-  e) ac_cv_lib_network_htonl=no ;;
-esac
+else
+  ac_cv_lib_network_htonl=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_htonl" >&5
-printf "%s\n" "$ac_cv_lib_network_htonl" >&6; }
-if test "x$ac_cv_lib_network_htonl" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_htonl" >&5
+$as_echo "$ac_cv_lib_network_htonl" >&6; }
+if test "x$ac_cv_lib_network_htonl" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __htonl in -lnetwork" >&5
-printf %s "checking for __htonl in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network___htonl+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __htonl in -lnetwork" >&5
+$as_echo_n "checking for __htonl in -lnetwork... " >&6; }
+if ${ac_cv_lib_network___htonl+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __htonl (void);
+char __htonl ();
 int
-main (void)
+main ()
 {
 return __htonl ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network___htonl=yes
-else case e in #(
-  e) ac_cv_lib_network___htonl=no ;;
-esac
+else
+  ac_cv_lib_network___htonl=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___htonl" >&5
-printf "%s\n" "$ac_cv_lib_network___htonl" >&6; }
-if test "x$ac_cv_lib_network___htonl" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___htonl" >&5
+$as_echo "$ac_cv_lib_network___htonl" >&6; }
+if test "x$ac_cv_lib_network___htonl" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnetwork"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -14040,10 +12822,10 @@
 
 
 
-printf "%s\n" "#define HAVE_HTONL 1" >>confdefs.h
+$as_echo "#define HAVE_HTONL 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBNETWORK 1" >>confdefs.h
+$as_echo "#define HAVE_LIBNETWORK 1" >>confdefs.h
 
     ac_cv_func_htonl=yes
   else
@@ -14065,27 +12847,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "gethostname" "ac_cv_func_gethostname"
-if test "x$ac_cv_func_gethostname" = xyes
-then :
+if test "x$ac_cv_func_gethostname" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__gethostname" "ac_cv_func___gethostname"
-if test "x$ac_cv_func___gethostname" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__gethostname" "ac_cv_func___gethostname"
+if test "x$ac_cv_func___gethostname" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_GETHOSTNAME 1" >>confdefs.h
+$as_echo "#define HAVE_GETHOSTNAME 1" >>confdefs.h
 
     ac_cv_func_gethostname=yes
   ;;
@@ -14095,140 +12873,118 @@
   unset ac_cv_lib_nsl_gethostname
   unset ac_cv_lib_nsl___gethostname
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostname in -lnsl" >&5
-printf %s "checking for gethostname in -lnsl... " >&6; }
-if test ${ac_cv_lib_nsl_gethostname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostname in -lnsl" >&5
+$as_echo_n "checking for gethostname in -lnsl... " >&6; }
+if ${ac_cv_lib_nsl_gethostname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char gethostname (void);
+char gethostname ();
 int
-main (void)
+main ()
 {
 return gethostname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nsl_gethostname=yes
-else case e in #(
-  e) ac_cv_lib_nsl_gethostname=no ;;
-esac
+else
+  ac_cv_lib_nsl_gethostname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostname" >&5
-printf "%s\n" "$ac_cv_lib_nsl_gethostname" >&6; }
-if test "x$ac_cv_lib_nsl_gethostname" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __gethostname in -lnsl" >&5
-printf %s "checking for __gethostname in -lnsl... " >&6; }
-if test ${ac_cv_lib_nsl___gethostname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gethostname in -lnsl" >&5
+$as_echo_n "checking for __gethostname in -lnsl... " >&6; }
+if ${ac_cv_lib_nsl___gethostname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __gethostname (void);
+char __gethostname ();
 int
-main (void)
+main ()
 {
 return __gethostname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nsl___gethostname=yes
-else case e in #(
-  e) ac_cv_lib_nsl___gethostname=no ;;
-esac
+else
+  ac_cv_lib_nsl___gethostname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl___gethostname" >&5
-printf "%s\n" "$ac_cv_lib_nsl___gethostname" >&6; }
-if test "x$ac_cv_lib_nsl___gethostname" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -14246,10 +13002,10 @@
 
 
 
-printf "%s\n" "#define HAVE_GETHOSTNAME 1" >>confdefs.h
+$as_echo "#define HAVE_GETHOSTNAME 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBNSL 1" >>confdefs.h
+$as_echo "#define HAVE_LIBNSL 1" >>confdefs.h
 
     ac_cv_func_gethostname=yes
   else
@@ -14258,140 +13014,118 @@
   unset ac_cv_lib_network_gethostname
   unset ac_cv_lib_network___gethostname
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostname in -lnetwork" >&5
-printf %s "checking for gethostname in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network_gethostname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostname in -lnetwork" >&5
+$as_echo_n "checking for gethostname in -lnetwork... " >&6; }
+if ${ac_cv_lib_network_gethostname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char gethostname (void);
+char gethostname ();
 int
-main (void)
+main ()
 {
 return gethostname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network_gethostname=yes
-else case e in #(
-  e) ac_cv_lib_network_gethostname=no ;;
-esac
+else
+  ac_cv_lib_network_gethostname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_gethostname" >&5
-printf "%s\n" "$ac_cv_lib_network_gethostname" >&6; }
-if test "x$ac_cv_lib_network_gethostname" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_gethostname" >&5
+$as_echo "$ac_cv_lib_network_gethostname" >&6; }
+if test "x$ac_cv_lib_network_gethostname" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __gethostname in -lnetwork" >&5
-printf %s "checking for __gethostname in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network___gethostname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gethostname in -lnetwork" >&5
+$as_echo_n "checking for __gethostname in -lnetwork... " >&6; }
+if ${ac_cv_lib_network___gethostname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __gethostname (void);
+char __gethostname ();
 int
-main (void)
+main ()
 {
 return __gethostname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network___gethostname=yes
-else case e in #(
-  e) ac_cv_lib_network___gethostname=no ;;
-esac
+else
+  ac_cv_lib_network___gethostname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___gethostname" >&5
-printf "%s\n" "$ac_cv_lib_network___gethostname" >&6; }
-if test "x$ac_cv_lib_network___gethostname" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___gethostname" >&5
+$as_echo "$ac_cv_lib_network___gethostname" >&6; }
+if test "x$ac_cv_lib_network___gethostname" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnetwork"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -14409,10 +13143,10 @@
 
 
 
-printf "%s\n" "#define HAVE_GETHOSTNAME 1" >>confdefs.h
+$as_echo "#define HAVE_GETHOSTNAME 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBNETWORK 1" >>confdefs.h
+$as_echo "#define HAVE_LIBNETWORK 1" >>confdefs.h
 
     ac_cv_func_gethostname=yes
   else
@@ -14434,27 +13168,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "gethostbyaddr" "ac_cv_func_gethostbyaddr"
-if test "x$ac_cv_func_gethostbyaddr" = xyes
-then :
+if test "x$ac_cv_func_gethostbyaddr" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__gethostbyaddr" "ac_cv_func___gethostbyaddr"
-if test "x$ac_cv_func___gethostbyaddr" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__gethostbyaddr" "ac_cv_func___gethostbyaddr"
+if test "x$ac_cv_func___gethostbyaddr" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h
+$as_echo "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h
 
     ac_cv_func_gethostbyaddr=yes
   ;;
@@ -14464,140 +13194,118 @@
   unset ac_cv_lib_nsl_gethostbyaddr
   unset ac_cv_lib_nsl___gethostbyaddr
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lnsl" >&5
-printf %s "checking for gethostbyaddr in -lnsl... " >&6; }
-if test ${ac_cv_lib_nsl_gethostbyaddr+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lnsl" >&5
+$as_echo_n "checking for gethostbyaddr in -lnsl... " >&6; }
+if ${ac_cv_lib_nsl_gethostbyaddr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char gethostbyaddr (void);
+char gethostbyaddr ();
 int
-main (void)
+main ()
 {
 return gethostbyaddr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nsl_gethostbyaddr=yes
-else case e in #(
-  e) ac_cv_lib_nsl_gethostbyaddr=no ;;
-esac
+else
+  ac_cv_lib_nsl_gethostbyaddr=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyaddr" >&5
-printf "%s\n" "$ac_cv_lib_nsl_gethostbyaddr" >&6; }
-if test "x$ac_cv_lib_nsl_gethostbyaddr" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __gethostbyaddr in -lnsl" >&5
-printf %s "checking for __gethostbyaddr in -lnsl... " >&6; }
-if test ${ac_cv_lib_nsl___gethostbyaddr+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gethostbyaddr in -lnsl" >&5
+$as_echo_n "checking for __gethostbyaddr in -lnsl... " >&6; }
+if ${ac_cv_lib_nsl___gethostbyaddr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __gethostbyaddr (void);
+char __gethostbyaddr ();
 int
-main (void)
+main ()
 {
 return __gethostbyaddr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_nsl___gethostbyaddr=yes
-else case e in #(
-  e) ac_cv_lib_nsl___gethostbyaddr=no ;;
-esac
+else
+  ac_cv_lib_nsl___gethostbyaddr=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl___gethostbyaddr" >&5
-printf "%s\n" "$ac_cv_lib_nsl___gethostbyaddr" >&6; }
-if test "x$ac_cv_lib_nsl___gethostbyaddr" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -14615,10 +13323,10 @@
 
 
 
-printf "%s\n" "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h
+$as_echo "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBNSL 1" >>confdefs.h
+$as_echo "#define HAVE_LIBNSL 1" >>confdefs.h
 
     ac_cv_func_gethostbyaddr=yes
   else
@@ -14627,140 +13335,118 @@
   unset ac_cv_lib_network_gethostbyaddr
   unset ac_cv_lib_network___gethostbyaddr
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lnetwork" >&5
-printf %s "checking for gethostbyaddr in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network_gethostbyaddr+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lnetwork" >&5
+$as_echo_n "checking for gethostbyaddr in -lnetwork... " >&6; }
+if ${ac_cv_lib_network_gethostbyaddr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char gethostbyaddr (void);
+char gethostbyaddr ();
 int
-main (void)
+main ()
 {
 return gethostbyaddr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network_gethostbyaddr=yes
-else case e in #(
-  e) ac_cv_lib_network_gethostbyaddr=no ;;
-esac
+else
+  ac_cv_lib_network_gethostbyaddr=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_gethostbyaddr" >&5
-printf "%s\n" "$ac_cv_lib_network_gethostbyaddr" >&6; }
-if test "x$ac_cv_lib_network_gethostbyaddr" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_gethostbyaddr" >&5
+$as_echo "$ac_cv_lib_network_gethostbyaddr" >&6; }
+if test "x$ac_cv_lib_network_gethostbyaddr" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __gethostbyaddr in -lnetwork" >&5
-printf %s "checking for __gethostbyaddr in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network___gethostbyaddr+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gethostbyaddr in -lnetwork" >&5
+$as_echo_n "checking for __gethostbyaddr in -lnetwork... " >&6; }
+if ${ac_cv_lib_network___gethostbyaddr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __gethostbyaddr (void);
+char __gethostbyaddr ();
 int
-main (void)
+main ()
 {
 return __gethostbyaddr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network___gethostbyaddr=yes
-else case e in #(
-  e) ac_cv_lib_network___gethostbyaddr=no ;;
-esac
+else
+  ac_cv_lib_network___gethostbyaddr=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___gethostbyaddr" >&5
-printf "%s\n" "$ac_cv_lib_network___gethostbyaddr" >&6; }
-if test "x$ac_cv_lib_network___gethostbyaddr" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___gethostbyaddr" >&5
+$as_echo "$ac_cv_lib_network___gethostbyaddr" >&6; }
+if test "x$ac_cv_lib_network___gethostbyaddr" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnetwork"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -14778,10 +13464,10 @@
 
 
 
-printf "%s\n" "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h
+$as_echo "#define HAVE_GETHOSTBYADDR 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBNETWORK 1" >>confdefs.h
+$as_echo "#define HAVE_LIBNETWORK 1" >>confdefs.h
 
     ac_cv_func_gethostbyaddr=yes
   else
@@ -14803,27 +13489,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes
-then :
+if test "x$ac_cv_func_dlopen" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__dlopen" "ac_cv_func___dlopen"
-if test "x$ac_cv_func___dlopen" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__dlopen" "ac_cv_func___dlopen"
+if test "x$ac_cv_func___dlopen" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h
+$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
 
     ac_cv_func_dlopen=yes
   ;;
@@ -14833,140 +13515,118 @@
   unset ac_cv_lib_dl_dlopen
   unset ac_cv_lib_dl___dlopen
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-printf %s "checking for dlopen in -ldl... " >&6; }
-if test ${ac_cv_lib_dl_dlopen+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dlopen (void);
+char dlopen ();
 int
-main (void)
+main ()
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
-else case e in #(
-  e) ac_cv_lib_dl_dlopen=no ;;
-esac
+else
+  ac_cv_lib_dl_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dlopen in -ldl" >&5
-printf %s "checking for __dlopen in -ldl... " >&6; }
-if test ${ac_cv_lib_dl___dlopen+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dlopen in -ldl" >&5
+$as_echo_n "checking for __dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl___dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dlopen (void);
+char __dlopen ();
 int
-main (void)
+main ()
 {
 return __dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl___dlopen=yes
-else case e in #(
-  e) ac_cv_lib_dl___dlopen=no ;;
-esac
+else
+  ac_cv_lib_dl___dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl___dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl___dlopen" >&6; }
-if test "x$ac_cv_lib_dl___dlopen" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl___dlopen" >&5
+$as_echo "$ac_cv_lib_dl___dlopen" >&6; }
+if test "x$ac_cv_lib_dl___dlopen" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -14984,10 +13644,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h
+$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBDL 1" >>confdefs.h
+$as_echo "#define HAVE_LIBDL 1" >>confdefs.h
 
     ac_cv_func_dlopen=yes
   else
@@ -14996,140 +13656,118 @@
   unset ac_cv_lib_root_dlopen
   unset ac_cv_lib_root___dlopen
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lroot" >&5
-printf %s "checking for dlopen in -lroot... " >&6; }
-if test ${ac_cv_lib_root_dlopen+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lroot" >&5
+$as_echo_n "checking for dlopen in -lroot... " >&6; }
+if ${ac_cv_lib_root_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lroot  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dlopen (void);
+char dlopen ();
 int
-main (void)
+main ()
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_root_dlopen=yes
-else case e in #(
-  e) ac_cv_lib_root_dlopen=no ;;
-esac
+else
+  ac_cv_lib_root_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_root_dlopen" >&6; }
-if test "x$ac_cv_lib_root_dlopen" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root_dlopen" >&5
+$as_echo "$ac_cv_lib_root_dlopen" >&6; }
+if test "x$ac_cv_lib_root_dlopen" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dlopen in -lroot" >&5
-printf %s "checking for __dlopen in -lroot... " >&6; }
-if test ${ac_cv_lib_root___dlopen+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dlopen in -lroot" >&5
+$as_echo_n "checking for __dlopen in -lroot... " >&6; }
+if ${ac_cv_lib_root___dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lroot  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dlopen (void);
+char __dlopen ();
 int
-main (void)
+main ()
 {
 return __dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_root___dlopen=yes
-else case e in #(
-  e) ac_cv_lib_root___dlopen=no ;;
-esac
+else
+  ac_cv_lib_root___dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root___dlopen" >&5
-printf "%s\n" "$ac_cv_lib_root___dlopen" >&6; }
-if test "x$ac_cv_lib_root___dlopen" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root___dlopen" >&5
+$as_echo "$ac_cv_lib_root___dlopen" >&6; }
+if test "x$ac_cv_lib_root___dlopen" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lroot"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -15147,10 +13785,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DLOPEN 1" >>confdefs.h
+$as_echo "#define HAVE_DLOPEN 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBROOT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBROOT 1" >>confdefs.h
 
     ac_cv_func_dlopen=yes
   else
@@ -15172,27 +13810,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "dlsym" "ac_cv_func_dlsym"
-if test "x$ac_cv_func_dlsym" = xyes
-then :
+if test "x$ac_cv_func_dlsym" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__dlsym" "ac_cv_func___dlsym"
-if test "x$ac_cv_func___dlsym" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__dlsym" "ac_cv_func___dlsym"
+if test "x$ac_cv_func___dlsym" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_DLSYM 1" >>confdefs.h
+$as_echo "#define HAVE_DLSYM 1" >>confdefs.h
 
     ac_cv_func_dlsym=yes
   ;;
@@ -15202,140 +13836,118 @@
   unset ac_cv_lib_dl_dlsym
   unset ac_cv_lib_dl___dlsym
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5
-printf %s "checking for dlsym in -ldl... " >&6; }
-if test ${ac_cv_lib_dl_dlsym+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5
+$as_echo_n "checking for dlsym in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlsym+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dlsym (void);
+char dlsym ();
 int
-main (void)
+main ()
 {
 return dlsym ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlsym=yes
-else case e in #(
-  e) ac_cv_lib_dl_dlsym=no ;;
-esac
+else
+  ac_cv_lib_dl_dlsym=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlsym" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlsym" >&6; }
-if test "x$ac_cv_lib_dl_dlsym" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlsym" >&5
+$as_echo "$ac_cv_lib_dl_dlsym" >&6; }
+if test "x$ac_cv_lib_dl_dlsym" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dlsym in -ldl" >&5
-printf %s "checking for __dlsym in -ldl... " >&6; }
-if test ${ac_cv_lib_dl___dlsym+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dlsym in -ldl" >&5
+$as_echo_n "checking for __dlsym in -ldl... " >&6; }
+if ${ac_cv_lib_dl___dlsym+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dlsym (void);
+char __dlsym ();
 int
-main (void)
+main ()
 {
 return __dlsym ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl___dlsym=yes
-else case e in #(
-  e) ac_cv_lib_dl___dlsym=no ;;
-esac
+else
+  ac_cv_lib_dl___dlsym=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl___dlsym" >&5
-printf "%s\n" "$ac_cv_lib_dl___dlsym" >&6; }
-if test "x$ac_cv_lib_dl___dlsym" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl___dlsym" >&5
+$as_echo "$ac_cv_lib_dl___dlsym" >&6; }
+if test "x$ac_cv_lib_dl___dlsym" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -15353,10 +13965,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DLSYM 1" >>confdefs.h
+$as_echo "#define HAVE_DLSYM 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBDL 1" >>confdefs.h
+$as_echo "#define HAVE_LIBDL 1" >>confdefs.h
 
     ac_cv_func_dlsym=yes
   else
@@ -15365,140 +13977,118 @@
   unset ac_cv_lib_root_dlsym
   unset ac_cv_lib_root___dlsym
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlsym in -lroot" >&5
-printf %s "checking for dlsym in -lroot... " >&6; }
-if test ${ac_cv_lib_root_dlsym+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym in -lroot" >&5
+$as_echo_n "checking for dlsym in -lroot... " >&6; }
+if ${ac_cv_lib_root_dlsym+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lroot  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dlsym (void);
+char dlsym ();
 int
-main (void)
+main ()
 {
 return dlsym ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_root_dlsym=yes
-else case e in #(
-  e) ac_cv_lib_root_dlsym=no ;;
-esac
+else
+  ac_cv_lib_root_dlsym=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root_dlsym" >&5
-printf "%s\n" "$ac_cv_lib_root_dlsym" >&6; }
-if test "x$ac_cv_lib_root_dlsym" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root_dlsym" >&5
+$as_echo "$ac_cv_lib_root_dlsym" >&6; }
+if test "x$ac_cv_lib_root_dlsym" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dlsym in -lroot" >&5
-printf %s "checking for __dlsym in -lroot... " >&6; }
-if test ${ac_cv_lib_root___dlsym+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __dlsym in -lroot" >&5
+$as_echo_n "checking for __dlsym in -lroot... " >&6; }
+if ${ac_cv_lib_root___dlsym+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lroot  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dlsym (void);
+char __dlsym ();
 int
-main (void)
+main ()
 {
 return __dlsym ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_root___dlsym=yes
-else case e in #(
-  e) ac_cv_lib_root___dlsym=no ;;
-esac
+else
+  ac_cv_lib_root___dlsym=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root___dlsym" >&5
-printf "%s\n" "$ac_cv_lib_root___dlsym" >&6; }
-if test "x$ac_cv_lib_root___dlsym" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root___dlsym" >&5
+$as_echo "$ac_cv_lib_root___dlsym" >&6; }
+if test "x$ac_cv_lib_root___dlsym" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lroot"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -15516,10 +14106,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DLSYM 1" >>confdefs.h
+$as_echo "#define HAVE_DLSYM 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBROOT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBROOT 1" >>confdefs.h
 
     ac_cv_func_dlsym=yes
   else
@@ -15537,55 +14127,49 @@
 
 if test "$ac_cv_func_dlopen" = "yes"; then
 
-printf "%s\n" "#define HAVE_LIBDL 1" >>confdefs.h
+$as_echo "#define HAVE_LIBDL 1" >>confdefs.h
 
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
-printf %s "checking for sin in -lm... " >&6; }
-if test ${ac_cv_lib_m_sin+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sin in -lm" >&5
+$as_echo_n "checking for sin in -lm... " >&6; }
+if ${ac_cv_lib_m_sin+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lm  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char sin (void);
+char sin ();
 int
-main (void)
+main ()
 {
 return sin ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_m_sin=yes
-else case e in #(
-  e) ac_cv_lib_m_sin=no ;;
-esac
+else
+  ac_cv_lib_m_sin=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sin" >&5
-printf "%s\n" "$ac_cv_lib_m_sin" >&6; }
-if test "x$ac_cv_lib_m_sin" = xyes
-then :
-  printf "%s\n" "#define HAVE_LIBM 1" >>confdefs.h
+{ $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" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBM 1
+_ACEOF
 
   LIBS="-lm $LIBS"
 
@@ -15600,27 +14184,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "__atomic_exchange_1" "ac_cv_func___atomic_exchange_1"
-if test "x$ac_cv_func___atomic_exchange_1" = xyes
-then :
+if test "x$ac_cv_func___atomic_exchange_1" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "____atomic_exchange_1" "ac_cv_func_____atomic_exchange_1"
-if test "x$ac_cv_func_____atomic_exchange_1" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "____atomic_exchange_1" "ac_cv_func_____atomic_exchange_1"
+if test "x$ac_cv_func_____atomic_exchange_1" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE___ATOMIC_EXCHANGE_1 1" >>confdefs.h
+$as_echo "#define HAVE___ATOMIC_EXCHANGE_1 1" >>confdefs.h
 
     ac_cv_func___atomic_exchange_1=yes
   ;;
@@ -15630,140 +14210,118 @@
   unset ac_cv_lib_atomic___atomic_exchange_1
   unset ac_cv_lib_atomic_____atomic_exchange_1
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __atomic_exchange_1 in -latomic" >&5
-printf %s "checking for __atomic_exchange_1 in -latomic... " >&6; }
-if test ${ac_cv_lib_atomic___atomic_exchange_1+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __atomic_exchange_1 in -latomic" >&5
+$as_echo_n "checking for __atomic_exchange_1 in -latomic... " >&6; }
+if ${ac_cv_lib_atomic___atomic_exchange_1+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-latomic  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __atomic_exchange_1 (void);
+char __atomic_exchange_1 ();
 int
-main (void)
+main ()
 {
 return __atomic_exchange_1 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_atomic___atomic_exchange_1=yes
-else case e in #(
-  e) ac_cv_lib_atomic___atomic_exchange_1=no ;;
-esac
+else
+  ac_cv_lib_atomic___atomic_exchange_1=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atomic___atomic_exchange_1" >&5
-printf "%s\n" "$ac_cv_lib_atomic___atomic_exchange_1" >&6; }
-if test "x$ac_cv_lib_atomic___atomic_exchange_1" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atomic___atomic_exchange_1" >&5
+$as_echo "$ac_cv_lib_atomic___atomic_exchange_1" >&6; }
+if test "x$ac_cv_lib_atomic___atomic_exchange_1" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ____atomic_exchange_1 in -latomic" >&5
-printf %s "checking for ____atomic_exchange_1 in -latomic... " >&6; }
-if test ${ac_cv_lib_atomic_____atomic_exchange_1+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ____atomic_exchange_1 in -latomic" >&5
+$as_echo_n "checking for ____atomic_exchange_1 in -latomic... " >&6; }
+if ${ac_cv_lib_atomic_____atomic_exchange_1+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-latomic  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char ____atomic_exchange_1 (void);
+char ____atomic_exchange_1 ();
 int
-main (void)
+main ()
 {
 return ____atomic_exchange_1 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_atomic_____atomic_exchange_1=yes
-else case e in #(
-  e) ac_cv_lib_atomic_____atomic_exchange_1=no ;;
-esac
+else
+  ac_cv_lib_atomic_____atomic_exchange_1=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atomic_____atomic_exchange_1" >&5
-printf "%s\n" "$ac_cv_lib_atomic_____atomic_exchange_1" >&6; }
-if test "x$ac_cv_lib_atomic_____atomic_exchange_1" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_atomic_____atomic_exchange_1" >&5
+$as_echo "$ac_cv_lib_atomic_____atomic_exchange_1" >&6; }
+if test "x$ac_cv_lib_atomic_____atomic_exchange_1" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -latomic"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -15781,10 +14339,10 @@
 
 
 
-printf "%s\n" "#define HAVE___ATOMIC_EXCHANGE_1 1" >>confdefs.h
+$as_echo "#define HAVE___ATOMIC_EXCHANGE_1 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBATOMIC 1" >>confdefs.h
+$as_echo "#define HAVE_LIBATOMIC 1" >>confdefs.h
 
     ac_cv_func___atomic_exchange_1=yes
   else
@@ -15806,27 +14364,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton"
-if test "x$ac_cv_func_inet_aton" = xyes
-then :
+if test "x$ac_cv_func_inet_aton" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__inet_aton" "ac_cv_func___inet_aton"
-if test "x$ac_cv_func___inet_aton" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__inet_aton" "ac_cv_func___inet_aton"
+if test "x$ac_cv_func___inet_aton" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_INET_ATON 1" >>confdefs.h
+$as_echo "#define HAVE_INET_ATON 1" >>confdefs.h
 
     ac_cv_func_inet_aton=yes
   ;;
@@ -15836,140 +14390,118 @@
   unset ac_cv_lib_resolv_inet_aton
   unset ac_cv_lib_resolv___inet_aton
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lresolv" >&5
-printf %s "checking for inet_aton in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv_inet_aton+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lresolv" >&5
+$as_echo_n "checking for inet_aton in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv_inet_aton+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char inet_aton (void);
+char inet_aton ();
 int
-main (void)
+main ()
 {
 return inet_aton ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv_inet_aton=yes
-else case e in #(
-  e) ac_cv_lib_resolv_inet_aton=no ;;
-esac
+else
+  ac_cv_lib_resolv_inet_aton=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_aton" >&5
-printf "%s\n" "$ac_cv_lib_resolv_inet_aton" >&6; }
-if test "x$ac_cv_lib_resolv_inet_aton" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_aton" >&5
+$as_echo "$ac_cv_lib_resolv_inet_aton" >&6; }
+if test "x$ac_cv_lib_resolv_inet_aton" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __inet_aton in -lresolv" >&5
-printf %s "checking for __inet_aton in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv___inet_aton+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __inet_aton in -lresolv" >&5
+$as_echo_n "checking for __inet_aton in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv___inet_aton+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __inet_aton (void);
+char __inet_aton ();
 int
-main (void)
+main ()
 {
 return __inet_aton ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv___inet_aton=yes
-else case e in #(
-  e) ac_cv_lib_resolv___inet_aton=no ;;
-esac
+else
+  ac_cv_lib_resolv___inet_aton=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___inet_aton" >&5
-printf "%s\n" "$ac_cv_lib_resolv___inet_aton" >&6; }
-if test "x$ac_cv_lib_resolv___inet_aton" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___inet_aton" >&5
+$as_echo "$ac_cv_lib_resolv___inet_aton" >&6; }
+if test "x$ac_cv_lib_resolv___inet_aton" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -15987,10 +14519,10 @@
 
 
 
-printf "%s\n" "#define HAVE_INET_ATON 1" >>confdefs.h
+$as_echo "#define HAVE_INET_ATON 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h
+$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_inet_aton=yes
   else
@@ -15999,140 +14531,118 @@
   unset ac_cv_lib_bind_inet_aton
   unset ac_cv_lib_bind___inet_aton
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -lbind" >&5
-printf %s "checking for inet_aton in -lbind... " >&6; }
-if test ${ac_cv_lib_bind_inet_aton+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_bind_inet_aton+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char inet_aton (void);
+char inet_aton ();
 int
-main (void)
+main ()
 {
 return inet_aton ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind_inet_aton=yes
-else case e in #(
-  e) ac_cv_lib_bind_inet_aton=no ;;
-esac
+else
+  ac_cv_lib_bind_inet_aton=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_inet_aton" >&5
-printf "%s\n" "$ac_cv_lib_bind_inet_aton" >&6; }
-if test "x$ac_cv_lib_bind_inet_aton" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __inet_aton in -lbind" >&5
-printf %s "checking for __inet_aton in -lbind... " >&6; }
-if test ${ac_cv_lib_bind___inet_aton+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $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 ${ac_cv_lib_bind___inet_aton+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __inet_aton (void);
+char __inet_aton ();
 int
-main (void)
+main ()
 {
 return __inet_aton ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind___inet_aton=yes
-else case e in #(
-  e) ac_cv_lib_bind___inet_aton=no ;;
-esac
+else
+  ac_cv_lib_bind___inet_aton=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___inet_aton" >&5
-printf "%s\n" "$ac_cv_lib_bind___inet_aton" >&6; }
-if test "x$ac_cv_lib_bind___inet_aton" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -16150,10 +14660,10 @@
 
 
 
-printf "%s\n" "#define HAVE_INET_ATON 1" >>confdefs.h
+$as_echo "#define HAVE_INET_ATON 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBBIND 1" >>confdefs.h
+$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_inet_aton=yes
   else
@@ -16171,1157 +14681,63 @@
 
 
 
-ac_fn_c_check_header_compile "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_stdint_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_STDINT_H 1" >>confdefs.h
+for ac_header in  \
+stdint.h \
+dirent.h \
+sys/param.h \
+sys/types.h \
+sys/time.h \
+netinet/in.h \
+alloca.h \
+arpa/inet.h \
+arpa/nameser.h \
+crypt.h \
+dns.h \
+fcntl.h \
+grp.h \
+ieeefp.h \
+langinfo.h \
+linux/filter.h \
+linux/sock_diag.h \
+malloc.h \
+os/signpost.h \
+poll.h \
+pty.h \
+pwd.h \
+resolv.h \
+strings.h \
+syslog.h \
+sysexits.h \
+sys/ioctl.h \
+sys/file.h \
+sys/mman.h \
+sys/mount.h \
+sys/poll.h \
+sys/resource.h \
+sys/select.h \
+sys/socket.h \
+sys/stat.h \
+sys/statfs.h \
+sys/statvfs.h \
+sys/vfs.h \
+sys/sysexits.h \
+sys/uio.h \
+sys/wait.h \
+sys/loadavg.h \
+unistd.h \
+unix.h \
+utime.h \
+sys/utsname.h \
+sys/ipc.h \
+dlfcn.h \
+tmmintrin.h \
+nmmintrin.h \
+wmmintrin.h \
+immintrin.h
 
-fi
-ac_fn_c_check_header_compile "$LINENO" "dirent.h" "ac_cv_header_dirent_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_dirent_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_DIRENT_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_param_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_types_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_TYPES_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/time.h" "ac_cv_header_sys_time_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_time_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_TIME_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_netinet_in_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_NETINET_IN_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "alloca.h" "ac_cv_header_alloca_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_alloca_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_ALLOCA_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_arpa_inet_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_ARPA_INET_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "arpa/nameser.h" "ac_cv_header_arpa_nameser_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_arpa_nameser_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_ARPA_NAMESER_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_crypt_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_CRYPT_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "dns.h" "ac_cv_header_dns_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_dns_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_DNS_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_fcntl_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_FCNTL_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "grp.h" "ac_cv_header_grp_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_grp_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_GRP_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "ieeefp.h" "ac_cv_header_ieeefp_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_ieeefp_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_IEEEFP_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "langinfo.h" "ac_cv_header_langinfo_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_langinfo_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_LANGINFO_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "linux/filter.h" "ac_cv_header_linux_filter_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_linux_filter_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_LINUX_FILTER_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "linux/sock_diag.h" "ac_cv_header_linux_sock_diag_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_linux_sock_diag_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_LINUX_SOCK_DIAG_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "malloc.h" "ac_cv_header_malloc_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_malloc_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_MALLOC_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "os/signpost.h" "ac_cv_header_os_signpost_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_os_signpost_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_OS_SIGNPOST_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "poll.h" "ac_cv_header_poll_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_poll_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_POLL_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "pty.h" "ac_cv_header_pty_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_pty_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_PTY_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "pwd.h" "ac_cv_header_pwd_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_pwd_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_PWD_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "resolv.h" "ac_cv_header_resolv_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_resolv_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_RESOLV_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "strings.h" "ac_cv_header_strings_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_strings_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_STRINGS_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "syslog.h" "ac_cv_header_syslog_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_syslog_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYSLOG_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sysexits.h" "ac_cv_header_sysexits_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sysexits_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYSEXITS_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_ioctl_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_IOCTL_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/file.h" "ac_cv_header_sys_file_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_file_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_FILE_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_mman_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_MMAN_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_mount_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_MOUNT_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/poll.h" "ac_cv_header_sys_poll_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_poll_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_POLL_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/resource.h" "ac_cv_header_sys_resource_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_resource_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_RESOURCE_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_select_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_SELECT_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_socket_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_SOCKET_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/stat.h" "ac_cv_header_sys_stat_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_stat_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_STAT_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/statfs.h" "ac_cv_header_sys_statfs_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_statfs_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_STATFS_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/statvfs.h" "ac_cv_header_sys_statvfs_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_statvfs_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_STATVFS_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/vfs.h" "ac_cv_header_sys_vfs_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_vfs_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_VFS_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/sysexits.h" "ac_cv_header_sys_sysexits_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_sysexits_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_SYSEXITS_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/uio.h" "ac_cv_header_sys_uio_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_uio_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_UIO_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/wait.h" "ac_cv_header_sys_wait_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_wait_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/loadavg.h" "ac_cv_header_sys_loadavg_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_loadavg_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_LOADAVG_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_unistd_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "unix.h" "ac_cv_header_unix_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_unix_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_UNIX_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "utime.h" "ac_cv_header_utime_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_utime_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_UTIME_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/utsname.h" "ac_cv_header_sys_utsname_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_utsname_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_UTSNAME_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/ipc.h" "ac_cv_header_sys_ipc_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_sys_ipc_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_IPC_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_dlfcn_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "tmmintrin.h" "ac_cv_header_tmmintrin_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_tmmintrin_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_TMMINTRIN_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "nmmintrin.h" "ac_cv_header_nmmintrin_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
-
-"
-if test "x$ac_cv_header_nmmintrin_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_NMMINTRIN_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "wmmintrin.h" "ac_cv_header_wmmintrin_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
@@ -17339,40 +14755,19 @@
 #endif
 
 "
-if test "x$ac_cv_header_wmmintrin_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_WMMINTRIN_H 1" >>confdefs.h
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
 fi
-ac_fn_c_check_header_compile "$LINENO" "immintrin.h" "ac_cv_header_immintrin_h" "
-#ifdef HAVE_SYS_PARAM_H
-#include <sys/param.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_NAMESER_H
-#include <arpa/nameser.h>
-#endif
 
-"
-if test "x$ac_cv_header_immintrin_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_IMMINTRIN_H 1" >>confdefs.h
-
-fi
+done
 
 
 
   ac_fn_c_check_func "$LINENO" "fopencookie" "ac_cv_func_fopencookie"
-if test "x$ac_cv_func_fopencookie" = xyes
-then :
+if test "x$ac_cv_func_fopencookie" = xyes; then :
   have_glibc_fopencookie=yes
 fi
 
@@ -17385,25 +14780,23 @@
 #include <stdio.h>
 
 int
-main (void)
+main ()
 {
 cookie_io_functions_t cookie;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   have_cookie_io_functions_t=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
     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 :
 
     case $host_alias in
     *linux*)
@@ -17414,8 +14807,8 @@
       ;;
   esac
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #define _GNU_SOURCE
@@ -17448,20 +14841,17 @@
 
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
   cookie_io_functions_use_off64_t=yes
 
-else case e in #(
-  e)
+else
+
   cookie_io_functions_use_off64_t=no
- ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
@@ -17474,18 +14864,17 @@
 #include <stdio.h>
 
 int
-main (void)
+main ()
 {
 _IO_cookie_io_functions_t cookie;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   have_IO_cookie_io_functions_t=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
       if test "$have_cookie_io_functions_t" = "yes" ; then
         cookie_io_functions_t=_IO_cookie_io_functions_t
         have_fopen_cookie=yes
@@ -17494,51 +14883,51 @@
 
     if test "$have_fopen_cookie" = "yes" ; then
 
-printf "%s\n" "#define HAVE_FOPENCOOKIE 1" >>confdefs.h
+$as_echo "#define HAVE_FOPENCOOKIE 1" >>confdefs.h
 
 
-printf "%s\n" "#define COOKIE_IO_FUNCTIONS_T $cookie_io_functions_t" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COOKIE_IO_FUNCTIONS_T $cookie_io_functions_t
+_ACEOF
 
       if test "$cookie_io_functions_use_off64_t" = "yes" ; then
 
-printf "%s\n" "#define COOKIE_SEEKER_USES_OFF64_T 1" >>confdefs.h
+$as_echo "#define COOKIE_SEEKER_USES_OFF64_T 1" >>confdefs.h
 
       fi
     fi
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for broken getcwd" >&5
-printf %s "checking for broken getcwd... " >&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*)
 
-printf "%s\n" "#define HAVE_BROKEN_GETCWD 1" >>confdefs.h
+$as_echo "#define HAVE_BROKEN_GETCWD 1" >>confdefs.h
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; };;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; };;
     *)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; };;
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; };;
   esac
 
 if test "$GCC" = "yes"; then
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for broken gcc optimize-strlen" >&5
-printf %s "checking for broken gcc optimize-strlen... " >&6; }
-if test ${ac_cv_have_broken_gcc_strlen_opt+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-  if test "$cross_compiling" = yes
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken gcc optimize-strlen" >&5
+$as_echo_n "checking for broken gcc optimize-strlen... " >&6; }
+if ${ac_cv_have_broken_gcc_strlen_opt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+  if test "$cross_compiling" = yes; then :
 
   ac_cv_have_broken_gcc_strlen_opt=no
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdlib.h>
@@ -17558,26 +14947,22 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_have_broken_gcc_strlen_opt=yes
 
-else case e in #(
-  e)
+else
+
   ac_cv_have_broken_gcc_strlen_opt=no
- ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_broken_gcc_strlen_opt" >&5
-printf "%s\n" "$ac_cv_have_broken_gcc_strlen_opt" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_broken_gcc_strlen_opt" >&5
+$as_echo "$ac_cv_have_broken_gcc_strlen_opt" >&6; }
   if test "$ac_cv_have_broken_gcc_strlen_opt" = "yes"; then
     CFLAGS="$CFLAGS -fno-optimize-strlen"
   fi
@@ -17585,19 +14970,18 @@
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
-printf %s "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if test ${ac_cv_struct_tm+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+if ${ac_cv_struct_tm+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <time.h>
 
 int
-main (void)
+main ()
 {
 struct tm tm;
 				     int *p = &tm.tm_sec;
@@ -17606,142 +14990,57 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_struct_tm=time.h
-else case e in #(
-  e) ac_cv_struct_tm=sys/time.h ;;
-esac
+else
+  ac_cv_struct_tm=sys/time.h
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
-printf "%s\n" "$ac_cv_struct_tm" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
+$as_echo "$ac_cv_struct_tm" >&6; }
 if test $ac_cv_struct_tm = sys/time.h; then
 
-printf "%s\n" "#define TM_IN_SYS_TIME 1" >>confdefs.h
+$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC options needed to detect all undeclared functions" >&5
-printf %s "checking for $CC options needed to detect all undeclared functions... " >&6; }
-if test ${ac_cv_c_undeclared_builtin_options+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_save_CFLAGS=$CFLAGS
-   ac_cv_c_undeclared_builtin_options='cannot detect'
-   for ac_arg in '' -fno-builtin; do
-     CFLAGS="$ac_save_CFLAGS $ac_arg"
-     # This test program should *not* compile successfully.
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main (void)
-{
-(void) strchr;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-
-else case e in #(
-  e) # This test program should compile successfully.
-        # No library function is consistently available on
-        # freestanding implementations, so test against a dummy
-        # declaration.  Include always-available headers on the
-        # off chance that they somehow elicit warnings.
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <float.h>
-#include <limits.h>
-#include <stdarg.h>
-#include <stddef.h>
-extern void ac_decl (int, char *);
-
-int
-main (void)
-{
-(void) ac_decl (0, (char *) 0);
-  (void) ac_decl;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  if test x"$ac_arg" = x
-then :
-  ac_cv_c_undeclared_builtin_options='none needed'
-else case e in #(
-  e) ac_cv_c_undeclared_builtin_options=$ac_arg ;;
-esac
-fi
-          break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-    done
-    CFLAGS=$ac_save_CFLAGS
-   ;;
-esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_undeclared_builtin_options" >&5
-printf "%s\n" "$ac_cv_c_undeclared_builtin_options" >&6; }
-  case $ac_cv_c_undeclared_builtin_options in #(
-  'cannot detect') :
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
-as_fn_error $? "cannot make $CC report undeclared builtins
-See 'config.log' for more details" "$LINENO" 5; } ;; #(
-  'none needed') :
-    ac_c_undeclared_builtin_options='' ;; #(
-  *) :
-    ac_c_undeclared_builtin_options=$ac_cv_c_undeclared_builtin_options ;;
-esac
-
 ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_zone" "#include <sys/types.h>
 #include <$ac_cv_struct_tm>
 
 "
-if test "x$ac_cv_member_struct_tm_tm_zone" = xyes
-then :
+if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
 
-printf "%s\n" "#define HAVE_STRUCT_TM_TM_ZONE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_TM_TM_ZONE 1
+_ACEOF
 
 
 fi
 
 if test "$ac_cv_member_struct_tm_tm_zone" = yes; then
 
-printf "%s\n" "#define HAVE_TM_ZONE 1" >>confdefs.h
+$as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h
 
 else
-  ac_fn_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_tzname" = xyes
-then :
+  ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
+"
+if test "x$ac_cv_have_decl_tzname" = xyes; then :
   ac_have_decl=1
-else case e in #(
-  e) ac_have_decl=0 ;;
-esac
+else
+  ac_have_decl=0
 fi
-printf "%s\n" "#define HAVE_DECL_TZNAME $ac_have_decl" >>confdefs.h
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
-printf %s "checking for tzname... " >&6; }
-if test ${ac_cv_var_tzname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_TZNAME $ac_have_decl
+_ACEOF
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
+$as_echo_n "checking for tzname... " >&6; }
+if ${ac_cv_var_tzname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <time.h>
 #if !HAVE_DECL_TZNAME
@@ -17749,167 +15048,153 @@
 #endif
 
 int
-main (void)
+main ()
 {
 return tzname[0][0];
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_var_tzname=yes
-else case e in #(
-  e) ac_cv_var_tzname=no ;;
-esac
+else
+  ac_cv_var_tzname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
-printf "%s\n" "$ac_cv_var_tzname" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_tzname" >&5
+$as_echo "$ac_cv_var_tzname" >&6; }
   if test $ac_cv_var_tzname = yes; then
 
-printf "%s\n" "#define HAVE_TZNAME 1" >>confdefs.h
+$as_echo "#define HAVE_TZNAME 1" >>confdefs.h
 
   fi
 fi
 
 
 
-ac_fn_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "#include <time.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_localtime_r" = xyes
-then :
+ac_fn_c_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "#include <time.h>
+"
+if test "x$ac_cv_have_decl_localtime_r" = xyes; then :
+
+else
+
+$as_echo "#define MISSING_LOCALTIME_R_DECL 1" >>confdefs.h
 
-else case e in #(
-  e)
-printf "%s\n" "#define MISSING_LOCALTIME_R_DECL 1" >>confdefs.h
- ;;
-esac
 fi
-ac_fn_check_decl "$LINENO" "gmtime_r" "ac_cv_have_decl_gmtime_r" "#include <time.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_gmtime_r" = xyes
-then :
-
-else case e in #(
-  e)
-printf "%s\n" "#define MISSING_GMTIME_R_DECL 1" >>confdefs.h
- ;;
-esac
+
+ac_fn_c_check_decl "$LINENO" "gmtime_r" "ac_cv_have_decl_gmtime_r" "#include <time.h>
+"
+if test "x$ac_cv_have_decl_gmtime_r" = xyes; then :
+
+else
+
+$as_echo "#define MISSING_GMTIME_R_DECL 1" >>confdefs.h
+
 fi
-ac_fn_check_decl "$LINENO" "asctime_r" "ac_cv_have_decl_asctime_r" "#include <time.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_asctime_r" = xyes
-then :
-
-else case e in #(
-  e)
-printf "%s\n" "#define MISSING_ASCTIME_R_DECL 1" >>confdefs.h
- ;;
-esac
+
+ac_fn_c_check_decl "$LINENO" "asctime_r" "ac_cv_have_decl_asctime_r" "#include <time.h>
+"
+if test "x$ac_cv_have_decl_asctime_r" = xyes; then :
+
+else
+
+$as_echo "#define MISSING_ASCTIME_R_DECL 1" >>confdefs.h
+
 fi
-ac_fn_check_decl "$LINENO" "ctime_r" "ac_cv_have_decl_ctime_r" "#include <time.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_ctime_r" = xyes
-then :
-
-else case e in #(
-  e)
-printf "%s\n" "#define MISSING_CTIME_R_DECL 1" >>confdefs.h
- ;;
-esac
+
+ac_fn_c_check_decl "$LINENO" "ctime_r" "ac_cv_have_decl_ctime_r" "#include <time.h>
+"
+if test "x$ac_cv_have_decl_ctime_r" = xyes; then :
+
+else
+
+$as_echo "#define MISSING_CTIME_R_DECL 1" >>confdefs.h
+
 fi
-ac_fn_check_decl "$LINENO" "strtok_r" "ac_cv_have_decl_strtok_r" "#include <string.h>
-" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_strtok_r" = xyes
-then :
-
-else case e in #(
-  e)
-printf "%s\n" "#define MISSING_STRTOK_R_DECL 1" >>confdefs.h
- ;;
-esac
+
+ac_fn_c_check_decl "$LINENO" "strtok_r" "ac_cv_have_decl_strtok_r" "#include <string.h>
+"
+if test "x$ac_cv_have_decl_strtok_r" = xyes; then :
+
+else
+
+$as_echo "#define MISSING_STRTOK_R_DECL 1" >>confdefs.h
+
 fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fclose declaration" >&5
-printf %s "checking for fclose declaration... " >&6; }
+
+  { $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
-main (void)
+main ()
 {
 int (*func)(FILE *) = fclose
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
+
 
+$as_echo "#define MISSING_FCLOSE_DECL 0" >>confdefs.h
 
-printf "%s\n" "#define MISSING_FCLOSE_DECL 0" >>confdefs.h
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+else
 
-else case e in #(
-  e)
 
-printf "%s\n" "#define MISSING_FCLOSE_DECL 1" >>confdefs.h
+$as_echo "#define MISSING_FCLOSE_DECL 1" >>confdefs.h
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: missing" >&5
+$as_echo "missing" >&6; }
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: missing" >&5
-printf "%s\n" "missing" >&6; }
-   ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct flock" >&5
-printf %s "checking for struct flock... " >&6; }
-if test ${ac_cv_struct_flock+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct flock" >&5
+$as_echo_n "checking for struct flock... " >&6; }
+if ${ac_cv_struct_flock+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <unistd.h>
 #include <fcntl.h>
 
 int
-main (void)
+main ()
 {
 struct flock x;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
           ac_cv_struct_flock=yes
 
-else case e in #(
-  e)
+else
+
           ac_cv_struct_flock=no
-         ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
- ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_flock" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_STRUCT_FLOCK 1" >>confdefs.h
+$as_echo "#define HAVE_STRUCT_FLOCK 1" >>confdefs.h
 
 fi
 
@@ -17923,36 +15208,35 @@
   #endif
 
 "
-if test "x$ac_cv_type_socklen_t" = xyes
-then :
+if test "x$ac_cv_type_socklen_t" = xyes; then :
 
-printf "%s\n" "#define HAVE_SOCKLEN_T 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SOCKLEN_T 1
+_ACEOF
 
 
 fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of intmax_t" >&5
-printf %s "checking size of intmax_t... " >&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+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  if ${php_cv_sizeof_intmax_t+:} false; 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 case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -17972,64 +15256,62 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     eval $php_cache_value=`cat conftestval`
 
-else case e in #(
-  e)
+else
+
     eval $php_cache_value=0
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   LDFLAGS=$old_LDFLAGS
   LIBS=$old_LIBS
- ;;
-esac
+
 fi
 
   if eval test "\$$php_cache_value" != "0"; then
 
 
-printf "%s\n" "#define SIZEOF_INTMAX_T $php_cv_sizeof_intmax_t" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INTMAX_T $php_cv_sizeof_intmax_t
+_ACEOF
 
 
-printf "%s\n" "#define HAVE_INTMAX_T 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_INTMAX_T 1
+_ACEOF
 
 
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_intmax_t" >&5
-printf "%s\n" "$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; }
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of ssize_t" >&5
-printf %s "checking size of ssize_t... " >&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+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  if ${php_cv_sizeof_ssize_t+:} false; 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 case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -18049,64 +15331,62 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     eval $php_cache_value=`cat conftestval`
 
-else case e in #(
-  e)
+else
+
     eval $php_cache_value=0
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   LDFLAGS=$old_LDFLAGS
   LIBS=$old_LIBS
- ;;
-esac
+
 fi
 
   if eval test "\$$php_cache_value" != "0"; then
 
 
-printf "%s\n" "#define SIZEOF_SSIZE_T $php_cv_sizeof_ssize_t" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_SSIZE_T $php_cv_sizeof_ssize_t
+_ACEOF
 
 
-printf "%s\n" "#define HAVE_SSIZE_T 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SSIZE_T 1
+_ACEOF
 
 
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_ssize_t" >&5
-printf "%s\n" "$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; }
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of ptrdiff_t" >&5
-printf %s "checking size of ptrdiff_t... " >&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+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  if ${php_cv_sizeof_ptrdiff_t+:} false; 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 case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
 #include <stdlib.h>
@@ -18126,253 +15406,241 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     eval $php_cache_value=`cat conftestval`
 
-else case e in #(
-  e)
+else
+
     eval $php_cache_value=0
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   LDFLAGS=$old_LDFLAGS
   LIBS=$old_LIBS
- ;;
-esac
+
 fi
 
   if eval test "\$$php_cache_value" != "0"; then
 
 
-printf "%s\n" "#define SIZEOF_PTRDIFF_T $php_cv_sizeof_ptrdiff_t" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_PTRDIFF_T $php_cv_sizeof_ptrdiff_t
+_ACEOF
 
 
-printf "%s\n" "#define HAVE_PTRDIFF_T 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_PTRDIFF_T 1
+_ACEOF
 
 
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_sizeof_ptrdiff_t" >&5
-printf "%s\n" "$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; }
 
 
 
   # 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]];'.
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
-printf %s "checking size of short... " >&6; }
-if test ${ac_cv_sizeof_short+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_short" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5
+$as_echo_n "checking size of short... " >&6; }
+if ${ac_cv_sizeof_short+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_short" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (short)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_short=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
-printf "%s\n" "$ac_cv_sizeof_short" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5
+$as_echo "$ac_cv_sizeof_short" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_SHORT $ac_cv_sizeof_short" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
+_ACEOF
 
 
   # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'.
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
-printf %s "checking size of int... " >&6; }
-if test ${ac_cv_sizeof_int+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_int" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5
+$as_echo_n "checking size of int... " >&6; }
+if ${ac_cv_sizeof_int+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_int" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (int)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_int=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
-printf "%s\n" "$ac_cv_sizeof_int" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5
+$as_echo "$ac_cv_sizeof_int" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_INT $ac_cv_sizeof_int" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+_ACEOF
 
 
   # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'.
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-printf %s "checking size of long... " >&6; }
-if test ${ac_cv_sizeof_long+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_long" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if ${ac_cv_sizeof_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-printf "%s\n" "$ac_cv_sizeof_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
 
 
   # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'.
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
-printf %s "checking size of long long... " >&6; }
-if test ${ac_cv_sizeof_long_long+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_long_long" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5
+$as_echo_n "checking size of long long... " >&6; }
+if ${ac_cv_sizeof_long_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long long)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long_long=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
-printf "%s\n" "$ac_cv_sizeof_long_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5
+$as_echo "$ac_cv_sizeof_long_long" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+_ACEOF
 
 
   # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'.
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
-printf %s "checking size of size_t... " >&6; }
-if test ${ac_cv_sizeof_size_t+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_size_t" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
+$as_echo_n "checking size of size_t... " >&6; }
+if ${ac_cv_sizeof_size_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_size_t" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (size_t)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_size_t=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
-printf "%s\n" "$ac_cv_sizeof_size_t" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
+$as_echo "$ac_cv_sizeof_size_t" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
+_ACEOF
 
 
   # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'.
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
-printf %s "checking size of off_t... " >&6; }
-if test ${ac_cv_sizeof_off_t+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_off_t" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
+$as_echo_n "checking size of off_t... " >&6; }
+if ${ac_cv_sizeof_off_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_off_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_error 77 "cannot compute sizeof (off_t)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_off_t=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5
-printf "%s\n" "$ac_cv_sizeof_off_t" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5
+$as_echo "$ac_cv_sizeof_off_t" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_OFF_T $ac_cv_sizeof_off_t" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_OFF_T $ac_cv_sizeof_off_t
+_ACEOF
 
 
   ac_fn_c_check_type "$LINENO" "int8_t" "ac_cv_type_int8_t" "
@@ -18382,17 +15650,17 @@
 #endif
 
 "
-if test "x$ac_cv_type_int8_t" = xyes
-then :
+if test "x$ac_cv_type_int8_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_INT8_T 1
+_ACEOF
 
-printf "%s\n" "#define HAVE_INT8_T 1" >>confdefs.h
 
+else
 
-else case e in #(
-  e)
     as_fn_error $? "One of the intN_t or uintN_t types is not available" "$LINENO" 5
-   ;;
-esac
+
 fi
 ac_fn_c_check_type "$LINENO" "int16_t" "ac_cv_type_int16_t" "
 #include <stdint.h>
@@ -18401,17 +15669,17 @@
 #endif
 
 "
-if test "x$ac_cv_type_int16_t" = xyes
-then :
+if test "x$ac_cv_type_int16_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_INT16_T 1
+_ACEOF
 
-printf "%s\n" "#define HAVE_INT16_T 1" >>confdefs.h
 
+else
 
-else case e in #(
-  e)
     as_fn_error $? "One of the intN_t or uintN_t types is not available" "$LINENO" 5
-   ;;
-esac
+
 fi
 ac_fn_c_check_type "$LINENO" "int32_t" "ac_cv_type_int32_t" "
 #include <stdint.h>
@@ -18420,17 +15688,17 @@
 #endif
 
 "
-if test "x$ac_cv_type_int32_t" = xyes
-then :
+if test "x$ac_cv_type_int32_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_INT32_T 1
+_ACEOF
 
-printf "%s\n" "#define HAVE_INT32_T 1" >>confdefs.h
 
+else
 
-else case e in #(
-  e)
     as_fn_error $? "One of the intN_t or uintN_t types is not available" "$LINENO" 5
-   ;;
-esac
+
 fi
 ac_fn_c_check_type "$LINENO" "int64_t" "ac_cv_type_int64_t" "
 #include <stdint.h>
@@ -18439,17 +15707,17 @@
 #endif
 
 "
-if test "x$ac_cv_type_int64_t" = xyes
-then :
+if test "x$ac_cv_type_int64_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_INT64_T 1
+_ACEOF
 
-printf "%s\n" "#define HAVE_INT64_T 1" >>confdefs.h
 
+else
 
-else case e in #(
-  e)
     as_fn_error $? "One of the intN_t or uintN_t types is not available" "$LINENO" 5
-   ;;
-esac
+
 fi
 ac_fn_c_check_type "$LINENO" "uint8_t" "ac_cv_type_uint8_t" "
 #include <stdint.h>
@@ -18458,17 +15726,17 @@
 #endif
 
 "
-if test "x$ac_cv_type_uint8_t" = xyes
-then :
+if test "x$ac_cv_type_uint8_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_UINT8_T 1
+_ACEOF
 
-printf "%s\n" "#define HAVE_UINT8_T 1" >>confdefs.h
 
+else
 
-else case e in #(
-  e)
     as_fn_error $? "One of the intN_t or uintN_t types is not available" "$LINENO" 5
-   ;;
-esac
+
 fi
 ac_fn_c_check_type "$LINENO" "uint16_t" "ac_cv_type_uint16_t" "
 #include <stdint.h>
@@ -18477,17 +15745,17 @@
 #endif
 
 "
-if test "x$ac_cv_type_uint16_t" = xyes
-then :
+if test "x$ac_cv_type_uint16_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_UINT16_T 1
+_ACEOF
 
-printf "%s\n" "#define HAVE_UINT16_T 1" >>confdefs.h
 
+else
 
-else case e in #(
-  e)
     as_fn_error $? "One of the intN_t or uintN_t types is not available" "$LINENO" 5
-   ;;
-esac
+
 fi
 ac_fn_c_check_type "$LINENO" "uint32_t" "ac_cv_type_uint32_t" "
 #include <stdint.h>
@@ -18496,17 +15764,17 @@
 #endif
 
 "
-if test "x$ac_cv_type_uint32_t" = xyes
-then :
+if test "x$ac_cv_type_uint32_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_UINT32_T 1
+_ACEOF
 
-printf "%s\n" "#define HAVE_UINT32_T 1" >>confdefs.h
 
+else
 
-else case e in #(
-  e)
     as_fn_error $? "One of the intN_t or uintN_t types is not available" "$LINENO" 5
-   ;;
-esac
+
 fi
 ac_fn_c_check_type "$LINENO" "uint64_t" "ac_cv_type_uint64_t" "
 #include <stdint.h>
@@ -18515,30 +15783,30 @@
 #endif
 
 "
-if test "x$ac_cv_type_uint64_t" = xyes
-then :
+if test "x$ac_cv_type_uint64_t" = xyes; then :
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_UINT64_T 1
+_ACEOF
 
-printf "%s\n" "#define HAVE_UINT64_T 1" >>confdefs.h
 
+else
 
-else case e in #(
-  e)
     as_fn_error $? "One of the intN_t or uintN_t types is not available" "$LINENO" 5
-   ;;
-esac
+
 fi
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5
-printf %s "checking for __builtin_expect... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_expect" >&5
+$as_echo_n "checking for __builtin_expect... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     return __builtin_expect(1,1) ? 1 : 0;
@@ -18547,37 +15815,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_expect=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_expect=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_EXPECT $have_builtin_expect" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_EXPECT $have_builtin_expect
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_clz" >&5
-printf %s "checking for __builtin_clz... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_clz" >&5
+$as_echo_n "checking for __builtin_clz... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     return __builtin_clz(1) ? 1 : 0;
@@ -18586,37 +15854,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_clz=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_clz=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_CLZ $have_builtin_clz" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_CLZ $have_builtin_clz
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_clzl" >&5
-printf %s "checking for __builtin_clzl... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_clzl" >&5
+$as_echo_n "checking for __builtin_clzl... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     return __builtin_clzl(1) ? 1 : 0;
@@ -18625,37 +15893,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_clzl=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_clzl=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_CLZL $have_builtin_clzl" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_CLZL $have_builtin_clzl
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_clzll" >&5
-printf %s "checking for __builtin_clzll... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_clzll" >&5
+$as_echo_n "checking for __builtin_clzll... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     return __builtin_clzll(1) ? 1 : 0;
@@ -18664,37 +15932,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_clzll=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_clzll=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_CLZLL $have_builtin_clzll" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_CLZLL $have_builtin_clzll
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_ctzl" >&5
-printf %s "checking for __builtin_ctzl... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_ctzl" >&5
+$as_echo_n "checking for __builtin_ctzl... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     return __builtin_ctzl(2L) ? 1 : 0;
@@ -18703,37 +15971,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_ctzl=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_ctzl=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_CTZL $have_builtin_ctzl" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_CTZL $have_builtin_ctzl
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_ctzll" >&5
-printf %s "checking for __builtin_ctzll... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_ctzll" >&5
+$as_echo_n "checking for __builtin_ctzll... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     return __builtin_ctzll(2LL) ? 1 : 0;
@@ -18742,37 +16010,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_ctzll=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_ctzll=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_CTZLL $have_builtin_ctzll" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_CTZLL $have_builtin_ctzll
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_smull_overflow" >&5
-printf %s "checking for __builtin_smull_overflow... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_smull_overflow" >&5
+$as_echo_n "checking for __builtin_smull_overflow... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     long tmpvar;
@@ -18782,37 +16050,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_smull_overflow=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_smull_overflow=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_SMULL_OVERFLOW $have_builtin_smull_overflow" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_SMULL_OVERFLOW $have_builtin_smull_overflow
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_smulll_overflow" >&5
-printf %s "checking for __builtin_smulll_overflow... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_smulll_overflow" >&5
+$as_echo_n "checking for __builtin_smulll_overflow... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     long long tmpvar;
@@ -18822,37 +16090,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_smulll_overflow=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_smulll_overflow=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_SMULLL_OVERFLOW $have_builtin_smulll_overflow" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_SMULLL_OVERFLOW $have_builtin_smulll_overflow
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_saddl_overflow" >&5
-printf %s "checking for __builtin_saddl_overflow... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_saddl_overflow" >&5
+$as_echo_n "checking for __builtin_saddl_overflow... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     long tmpvar;
@@ -18862,37 +16130,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_saddl_overflow=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_saddl_overflow=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_SADDL_OVERFLOW $have_builtin_saddl_overflow" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_SADDL_OVERFLOW $have_builtin_saddl_overflow
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_saddll_overflow" >&5
-printf %s "checking for __builtin_saddll_overflow... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_saddll_overflow" >&5
+$as_echo_n "checking for __builtin_saddll_overflow... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     long long tmpvar;
@@ -18902,37 +16170,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_saddll_overflow=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_saddll_overflow=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_SADDLL_OVERFLOW $have_builtin_saddll_overflow" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_SADDLL_OVERFLOW $have_builtin_saddll_overflow
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_ssubl_overflow" >&5
-printf %s "checking for __builtin_ssubl_overflow... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_ssubl_overflow" >&5
+$as_echo_n "checking for __builtin_ssubl_overflow... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     long tmpvar;
@@ -18942,37 +16210,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_ssubl_overflow=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_ssubl_overflow=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_SSUBL_OVERFLOW $have_builtin_ssubl_overflow" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_SSUBL_OVERFLOW $have_builtin_ssubl_overflow
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_ssubll_overflow" >&5
-printf %s "checking for __builtin_ssubll_overflow... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_ssubll_overflow" >&5
+$as_echo_n "checking for __builtin_ssubll_overflow... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     long long tmpvar;
@@ -18982,37 +16250,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_ssubll_overflow=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_ssubll_overflow=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_SSUBLL_OVERFLOW $have_builtin_ssubll_overflow" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_SSUBLL_OVERFLOW $have_builtin_ssubll_overflow
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_cpu_init" >&5
-printf %s "checking for __builtin_cpu_init... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_cpu_init" >&5
+$as_echo_n "checking for __builtin_cpu_init... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     __builtin_cpu_init();
@@ -19021,37 +16289,37 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_cpu_init=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_cpu_init=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_CPU_INIT $have_builtin_cpu_init" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_CPU_INIT $have_builtin_cpu_init
+_ACEOF
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __builtin_cpu_supports" >&5
-printf %s "checking for __builtin_cpu_supports... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_cpu_supports" >&5
+$as_echo_n "checking for __builtin_cpu_supports... " >&6; }
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
     return __builtin_cpu_supports("sse")? 1 : 0;
@@ -19060,42 +16328,41 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     have_builtin_cpu_supports=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
     have_builtin_cpu_supports=0
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-printf "%s\n" "#define PHP_HAVE_BUILTIN_CPU_SUPPORTS $have_builtin_cpu_supports" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_HAVE_BUILTIN_CPU_SUPPORTS $have_builtin_cpu_supports
+_ACEOF
+
 
 
+{ $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 ${ac_cv_alignof_exists+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports __alignof__" >&5
-printf %s "checking whether the compiler supports __alignof__... " >&6; }
-if test ${ac_cv_alignof_exists+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
-main (void)
+main ()
 {
 
   int align = __alignof__(int);
@@ -19104,184 +16371,184 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
   ac_cv_alignof_exists=yes
 
-else case e in #(
-  e)
+else
+
   ac_cv_alignof_exists=no
- ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_exists" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_ALIGNOF 1" >>confdefs.h
+$as_echo "#define HAVE_ALIGNOF 1" >>confdefs.h
 
 fi
 
 ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_tm_gmtoff" "#include <time.h>
 "
-if test "x$ac_cv_member_struct_tm_tm_gmtoff" = xyes
-then :
+if test "x$ac_cv_member_struct_tm_tm_gmtoff" = xyes; then :
 
-printf "%s\n" "#define HAVE_STRUCT_TM_TM_GMTOFF 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_TM_TM_GMTOFF 1
+_ACEOF
 
 
 fi
 
 ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_blksize" = xyes
-then :
+if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then :
 
-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BLKSIZE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_BLKSIZE 1
+_ACEOF
 
 
 fi
 ac_fn_c_check_member "$LINENO" "struct stat" "st_rdev" "ac_cv_member_struct_stat_st_rdev" "$ac_includes_default"
-if test "x$ac_cv_member_struct_stat_st_rdev" = xyes
-then :
+if test "x$ac_cv_member_struct_stat_st_rdev" = xyes; then :
 
-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_RDEV 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_RDEV 1
+_ACEOF
 
 
 fi
 
 if test "`uname -s 2>/dev/null`" != "QNX"; 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" = xyes
-then :
+if test "x$ac_cv_member_struct_stat_st_blocks" = xyes; then :
 
-printf "%s\n" "#define HAVE_STRUCT_STAT_ST_BLOCKS 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_STRUCT_STAT_ST_BLOCKS 1
+_ACEOF
 
 
-printf "%s\n" "#define HAVE_ST_BLOCKS 1" >>confdefs.h
+$as_echo "#define HAVE_ST_BLOCKS 1" >>confdefs.h
 
-else case e in #(
-  e) case " $LIBOBJS " in
+else
+  case " $LIBOBJS " in
   *" fileblocks.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS fileblocks.$ac_objext"
  ;;
 esac
- ;;
-esac
+
 fi
 
 
 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" = xyes
-then :
+if test "x$ac_cv_type_size_t" = xyes; then :
+
+else
+
+cat >>confdefs.h <<_ACEOF
+#define size_t unsigned int
+_ACEOF
 
-else case e in #(
-  e)
-printf "%s\n" "#define size_t unsigned int" >>confdefs.h
- ;;
-esac
 fi
 
-ac_fn_c_check_type "$LINENO" "uid_t" "ac_cv_type_uid_t" "$ac_includes_default"
-if test "x$ac_cv_type_uid_t" = xyes
-then :
-
-else case e in #(
-  e)
-printf "%s\n" "#define uid_t int" >>confdefs.h
- ;;
-esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
+$as_echo_n "checking for uid_t in sys/types.h... " >&6; }
+if ${ac_cv_type_uid_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <sys/types.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "uid_t" >/dev/null 2>&1; then :
+  ac_cv_type_uid_t=yes
+else
+  ac_cv_type_uid_t=no
 fi
+rm -f conftest*
 
-ac_fn_c_check_type "$LINENO" "gid_t" "ac_cv_type_gid_t" "$ac_includes_default"
-if test "x$ac_cv_type_gid_t" = xyes
-then :
-
-else case e in #(
-  e)
-printf "%s\n" "#define gid_t int" >>confdefs.h
- ;;
-esac
 fi
+{ $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
 
+$as_echo "#define uid_t int" >>confdefs.h
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5
-printf %s "checking for struct sockaddr_storage... " >&6; }
-if test ${ac_cv_sockaddr_storage+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+$as_echo "#define gid_t int" >>confdefs.h
+
+fi
+
+
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct sockaddr_storage" >&5
+$as_echo_n "checking for struct sockaddr_storage... " >&6; }
+if ${ac_cv_sockaddr_storage+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/socket.h>
 int
-main (void)
+main ()
 {
 struct sockaddr_storage s; s
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_sockaddr_storage=yes
-else case e in #(
-  e) ac_cv_sockaddr_storage=no ;;
-esac
+else
+  ac_cv_sockaddr_storage=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sockaddr_storage" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_SOCKADDR_STORAGE 1" >>confdefs.h
+$as_echo "#define HAVE_SOCKADDR_STORAGE 1" >>confdefs.h
 
   fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for field sa_len in struct sockaddr" >&5
-printf %s "checking for field sa_len in struct sockaddr... " >&6; }
-if test ${ac_cv_sockaddr_sa_len+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+    { $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 ${ac_cv_sockaddr_sa_len+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/socket.h>
 int
-main (void)
+main ()
 {
 static struct sockaddr sa; int n = (int) sa.sa_len; return n;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_sockaddr_sa_len=yes
-else case e in #(
-  e) ac_cv_sockaddr_sa_len=no ;;
-esac
+else
+  ac_cv_sockaddr_sa_len=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sockaddr_sa_len" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h
+$as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h
 
   fi
 
@@ -19294,13 +16561,12 @@
 
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __attribute__((ifunc))" >&5
-printf %s "checking for __attribute__((ifunc))... " >&6; }
-if test ${ax_cv_have_func_attribute_ifunc+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((ifunc))" >&5
+$as_echo_n "checking for __attribute__((ifunc))... " >&6; }
+if ${ax_cv_have_func_attribute_ifunc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -19310,7 +16576,7 @@
                     int foo( void ) __attribute__((ifunc("resolve_foo")));
 
 int
-main (void)
+main ()
 {
 
   ;
@@ -19318,31 +16584,27 @@
 }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-                                      if test -s conftest.err
-then :
+if ac_fn_c_try_link "$LINENO"; then :
+                                      if test -s conftest.err; then :
   ax_cv_have_func_attribute_ifunc=no
-else case e in #(
-  e) ax_cv_have_func_attribute_ifunc=yes ;;
-esac
+else
+  ax_cv_have_func_attribute_ifunc=yes
 fi
-else case e in #(
-  e) ax_cv_have_func_attribute_ifunc=no ;;
-esac
+else
+  ax_cv_have_func_attribute_ifunc=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-     ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_ifunc" >&5
-printf "%s\n" "$ax_cv_have_func_attribute_ifunc" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_ifunc" >&5
+$as_echo "$ax_cv_have_func_attribute_ifunc" >&6; }
 
-    if test yes = $ax_cv_have_func_attribute_ifunc
-then :
+    if test yes = $ax_cv_have_func_attribute_ifunc; then :
 
-printf "%s\n" "#define HAVE_FUNC_ATTRIBUTE_IFUNC 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_FUNC_ATTRIBUTE_IFUNC 1
+_ACEOF
 
 fi
 
@@ -19351,13 +16613,12 @@
 
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __attribute__((target))" >&5
-printf %s "checking for __attribute__((target))... " >&6; }
-if test ${ax_cv_have_func_attribute_target+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __attribute__((target))" >&5
+$as_echo_n "checking for __attribute__((target))... " >&6; }
+if ${ax_cv_have_func_attribute_target+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -19365,7 +16626,7 @@
                     int bar( void ) __attribute__((target("sse2")));
 
 int
-main (void)
+main ()
 {
 
   ;
@@ -19373,31 +16634,27 @@
 }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-                                      if test -s conftest.err
-then :
+if ac_fn_c_try_link "$LINENO"; then :
+                                      if test -s conftest.err; then :
   ax_cv_have_func_attribute_target=no
-else case e in #(
-  e) ax_cv_have_func_attribute_target=yes ;;
-esac
+else
+  ax_cv_have_func_attribute_target=yes
 fi
-else case e in #(
-  e) ax_cv_have_func_attribute_target=no ;;
-esac
+else
+  ax_cv_have_func_attribute_target=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-     ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_target" >&5
-printf "%s\n" "$ax_cv_have_func_attribute_target" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_have_func_attribute_target" >&5
+$as_echo "$ax_cv_have_func_attribute_target" >&6; }
 
-    if test yes = $ax_cv_have_func_attribute_target
-then :
+    if test yes = $ax_cv_have_func_attribute_target; then :
 
-printf "%s\n" "#define HAVE_FUNC_ATTRIBUTE_TARGET 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_FUNC_ATTRIBUTE_TARGET 1
+_ACEOF
 
 fi
 
@@ -19406,442 +16663,145 @@
  ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IPv6 support" >&5
-printf %s "checking for IPv6 support... " >&6; }
-if test ${ac_cv_ipv6_support+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IPv6 support" >&5
+$as_echo_n "checking for IPv6 support... " >&6; }
+if ${ac_cv_ipv6_support+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 int
-main (void)
+main ()
 {
 struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_ipv6_support=yes
-else case e in #(
-  e) ac_cv_ipv6_support=no ;;
-esac
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext ;;
-esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ipv6_support" >&5
-printf "%s\n" "$ac_cv_ipv6_support" >&6; }
-
-
-ac_fn_c_check_func "$LINENO" "alphasort" "ac_cv_func_alphasort"
-if test "x$ac_cv_func_alphasort" = xyes
-then :
-  printf "%s\n" "#define HAVE_ALPHASORT 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "asctime_r" "ac_cv_func_asctime_r"
-if test "x$ac_cv_func_asctime_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_ASCTIME_R 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "chroot" "ac_cv_func_chroot"
-if test "x$ac_cv_func_chroot" = xyes
-then :
-  printf "%s\n" "#define HAVE_CHROOT 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ctime_r" "ac_cv_func_ctime_r"
-if test "x$ac_cv_func_ctime_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_CTIME_R 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "explicit_memset" "ac_cv_func_explicit_memset"
-if test "x$ac_cv_func_explicit_memset" = xyes
-then :
-  printf "%s\n" "#define HAVE_EXPLICIT_MEMSET 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "fdatasync" "ac_cv_func_fdatasync"
-if test "x$ac_cv_func_fdatasync" = xyes
-then :
-  printf "%s\n" "#define HAVE_FDATASYNC 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "flock" "ac_cv_func_flock"
-if test "x$ac_cv_func_flock" = xyes
-then :
-  printf "%s\n" "#define HAVE_FLOCK 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ftok" "ac_cv_func_ftok"
-if test "x$ac_cv_func_ftok" = xyes
-then :
-  printf "%s\n" "#define HAVE_FTOK 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "funopen" "ac_cv_func_funopen"
-if test "x$ac_cv_func_funopen" = xyes
-then :
-  printf "%s\n" "#define HAVE_FUNOPEN 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "gai_strerror" "ac_cv_func_gai_strerror"
-if test "x$ac_cv_func_gai_strerror" = xyes
-then :
-  printf "%s\n" "#define HAVE_GAI_STRERROR 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getcwd" "ac_cv_func_getcwd"
-if test "x$ac_cv_func_getcwd" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETCWD 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg"
-if test "x$ac_cv_func_getloadavg" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETLOADAVG 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getlogin" "ac_cv_func_getlogin"
-if test "x$ac_cv_func_getlogin" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETLOGIN 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getprotobyname" "ac_cv_func_getprotobyname"
-if test "x$ac_cv_func_getprotobyname" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETPROTOBYNAME 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getprotobynumber" "ac_cv_func_getprotobynumber"
-if test "x$ac_cv_func_getprotobynumber" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETPROTOBYNUMBER 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getservbyname" "ac_cv_func_getservbyname"
-if test "x$ac_cv_func_getservbyname" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETSERVBYNAME 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getservbyport" "ac_cv_func_getservbyport"
-if test "x$ac_cv_func_getservbyport" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETSERVBYPORT 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getrusage" "ac_cv_func_getrusage"
-if test "x$ac_cv_func_getrusage" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETRUSAGE 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
-if test "x$ac_cv_func_gettimeofday" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETTIMEOFDAY 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "gmtime_r" "ac_cv_func_gmtime_r"
-if test "x$ac_cv_func_gmtime_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_GMTIME_R 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getpwnam_r" "ac_cv_func_getpwnam_r"
-if test "x$ac_cv_func_getpwnam_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETPWNAM_R 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getgrnam_r" "ac_cv_func_getgrnam_r"
-if test "x$ac_cv_func_getgrnam_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETGRNAM_R 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getpwuid_r" "ac_cv_func_getpwuid_r"
-if test "x$ac_cv_func_getpwuid_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETPWUID_R 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getwd" "ac_cv_func_getwd"
-if test "x$ac_cv_func_getwd" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETWD 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "glob" "ac_cv_func_glob"
-if test "x$ac_cv_func_glob" = xyes
-then :
-  printf "%s\n" "#define HAVE_GLOB 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "inet_ntoa" "ac_cv_func_inet_ntoa"
-if test "x$ac_cv_func_inet_ntoa" = xyes
-then :
-  printf "%s\n" "#define HAVE_INET_NTOA 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "inet_ntop" "ac_cv_func_inet_ntop"
-if test "x$ac_cv_func_inet_ntop" = xyes
-then :
-  printf "%s\n" "#define HAVE_INET_NTOP 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "inet_pton" "ac_cv_func_inet_pton"
-if test "x$ac_cv_func_inet_pton" = xyes
-then :
-  printf "%s\n" "#define HAVE_INET_PTON 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r"
-if test "x$ac_cv_func_localtime_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_LOCALTIME_R 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "lchown" "ac_cv_func_lchown"
-if test "x$ac_cv_func_lchown" = xyes
-then :
-  printf "%s\n" "#define HAVE_LCHOWN 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "memcntl" "ac_cv_func_memcntl"
-if test "x$ac_cv_func_memcntl" = xyes
-then :
-  printf "%s\n" "#define HAVE_MEMCNTL 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "memmove" "ac_cv_func_memmove"
-if test "x$ac_cv_func_memmove" = xyes
-then :
-  printf "%s\n" "#define HAVE_MEMMOVE 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "mkstemp" "ac_cv_func_mkstemp"
-if test "x$ac_cv_func_mkstemp" = xyes
-then :
-  printf "%s\n" "#define HAVE_MKSTEMP 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "mmap" "ac_cv_func_mmap"
-if test "x$ac_cv_func_mmap" = xyes
-then :
-  printf "%s\n" "#define HAVE_MMAP 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "nice" "ac_cv_func_nice"
-if test "x$ac_cv_func_nice" = xyes
-then :
-  printf "%s\n" "#define HAVE_NICE 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "nl_langinfo" "ac_cv_func_nl_langinfo"
-if test "x$ac_cv_func_nl_langinfo" = xyes
-then :
-  printf "%s\n" "#define HAVE_NL_LANGINFO 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll"
-if test "x$ac_cv_func_poll" = xyes
-then :
-  printf "%s\n" "#define HAVE_POLL 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "pthread_jit_write_protect_np" "ac_cv_func_pthread_jit_write_protect_np"
-if test "x$ac_cv_func_pthread_jit_write_protect_np" = xyes
-then :
-  printf "%s\n" "#define HAVE_PTHREAD_JIT_WRITE_PROTECT_NP 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv"
-if test "x$ac_cv_func_putenv" = xyes
-then :
-  printf "%s\n" "#define HAVE_PUTENV 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "scandir" "ac_cv_func_scandir"
-if test "x$ac_cv_func_scandir" = xyes
-then :
-  printf "%s\n" "#define HAVE_SCANDIR 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "setitimer" "ac_cv_func_setitimer"
-if test "x$ac_cv_func_setitimer" = xyes
-then :
-  printf "%s\n" "#define HAVE_SETITIMER 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "setenv" "ac_cv_func_setenv"
-if test "x$ac_cv_func_setenv" = xyes
-then :
-  printf "%s\n" "#define HAVE_SETENV 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "shutdown" "ac_cv_func_shutdown"
-if test "x$ac_cv_func_shutdown" = xyes
-then :
-  printf "%s\n" "#define HAVE_SHUTDOWN 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask"
-if test "x$ac_cv_func_sigprocmask" = xyes
-then :
-  printf "%s\n" "#define HAVE_SIGPROCMASK 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "statfs" "ac_cv_func_statfs"
-if test "x$ac_cv_func_statfs" = xyes
-then :
-  printf "%s\n" "#define HAVE_STATFS 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "statvfs" "ac_cv_func_statvfs"
-if test "x$ac_cv_func_statvfs" = xyes
-then :
-  printf "%s\n" "#define HAVE_STATVFS 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "std_syslog" "ac_cv_func_std_syslog"
-if test "x$ac_cv_func_std_syslog" = xyes
-then :
-  printf "%s\n" "#define HAVE_STD_SYSLOG 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp"
-if test "x$ac_cv_func_strcasecmp" = xyes
-then :
-  printf "%s\n" "#define HAVE_STRCASECMP 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen"
-if test "x$ac_cv_func_strnlen" = xyes
-then :
-  printf "%s\n" "#define HAVE_STRNLEN 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "strptime" "ac_cv_func_strptime"
-if test "x$ac_cv_func_strptime" = xyes
-then :
-  printf "%s\n" "#define HAVE_STRPTIME 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "strtok_r" "ac_cv_func_strtok_r"
-if test "x$ac_cv_func_strtok_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_STRTOK_R 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "symlink" "ac_cv_func_symlink"
-if test "x$ac_cv_func_symlink" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYMLINK 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "tzset" "ac_cv_func_tzset"
-if test "x$ac_cv_func_tzset" = xyes
-then :
-  printf "%s\n" "#define HAVE_TZSET 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "unsetenv" "ac_cv_func_unsetenv"
-if test "x$ac_cv_func_unsetenv" = xyes
-then :
-  printf "%s\n" "#define HAVE_UNSETENV 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "usleep" "ac_cv_func_usleep"
-if test "x$ac_cv_func_usleep" = xyes
-then :
-  printf "%s\n" "#define HAVE_USLEEP 1" >>confdefs.h
-
+else
+  ac_cv_ipv6_support=no
 fi
-ac_fn_c_check_func "$LINENO" "utime" "ac_cv_func_utime"
-if test "x$ac_cv_func_utime" = xyes
-then :
-  printf "%s\n" "#define HAVE_UTIME 1" >>confdefs.h
-
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-ac_fn_c_check_func "$LINENO" "vasprintf" "ac_cv_func_vasprintf"
-if test "x$ac_cv_func_vasprintf" = xyes
-then :
-  printf "%s\n" "#define HAVE_VASPRINTF 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ipv6_support" >&5
+$as_echo "$ac_cv_ipv6_support" >&6; }
 
-fi
-ac_fn_c_check_func "$LINENO" "asprintf" "ac_cv_func_asprintf"
-if test "x$ac_cv_func_asprintf" = xyes
-then :
-  printf "%s\n" "#define HAVE_ASPRINTF 1" >>confdefs.h
 
-fi
-ac_fn_c_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep"
-if test "x$ac_cv_func_nanosleep" = xyes
-then :
-  printf "%s\n" "#define HAVE_NANOSLEEP 1" >>confdefs.h
+for ac_func in alphasort \
+asctime_r \
+chroot \
+ctime_r \
+explicit_memset \
+fdatasync \
+flock \
+ftok \
+funopen \
+gai_strerror \
+getcwd \
+getloadavg \
+getlogin \
+getprotobyname \
+getprotobynumber \
+getservbyname \
+getservbyport \
+getrusage \
+gettimeofday \
+gmtime_r \
+getpwnam_r \
+getgrnam_r \
+getpwuid_r \
+getwd \
+glob \
+inet_ntoa \
+inet_ntop \
+inet_pton \
+localtime_r \
+lchown \
+memcntl \
+memmove \
+mkstemp \
+mmap \
+nice \
+nl_langinfo \
+poll \
+pthread_jit_write_protect_np \
+putenv \
+scandir \
+setitimer \
+setenv \
+shutdown \
+sigprocmask \
+statfs \
+statvfs \
+std_syslog \
+strcasecmp \
+strnlen \
+strptime \
+strtok_r \
+symlink \
+tzset \
+unsetenv \
+usleep \
+utime \
+vasprintf \
+asprintf \
+nanosleep \
+memmem \
+memrchr \
 
-fi
-ac_fn_c_check_func "$LINENO" "memmem" "ac_cv_func_memmem"
-if test "x$ac_cv_func_memmem" = xyes
-then :
-  printf "%s\n" "#define HAVE_MEMMEM 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "memrchr" "ac_cv_func_memrchr"
-if test "x$ac_cv_func_memrchr" = xyes
-then :
-  printf "%s\n" "#define HAVE_MEMRCHR 1" >>confdefs.h
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
+done
 
 
-ac_fn_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_strerror_r" = xyes
-then :
+ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default"
+if test "x$ac_cv_have_decl_strerror_r" = xyes; then :
   ac_have_decl=1
-else case e in #(
-  e) ac_have_decl=0 ;;
-esac
+else
+  ac_have_decl=0
 fi
-printf "%s\n" "#define HAVE_DECL_STRERROR_R $ac_have_decl" >>confdefs.h
 
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRERROR_R $ac_have_decl
+_ACEOF
 
-if test $ac_cv_have_decl_strerror_r = yes; then
-  # For backward compatibility's sake, define HAVE_STRERROR_R.
-  # (We used to run AC_CHECK_FUNCS_ONCE for strerror_r, as well
-  # as AC_CHECK_DECLS_ONCE.)
-
-printf "%s\n" "#define HAVE_STRERROR_R 1" >>confdefs.h
+for ac_func in strerror_r
+do :
+  ac_fn_c_check_func "$LINENO" "strerror_r" "ac_cv_func_strerror_r"
+if test "x$ac_cv_func_strerror_r" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_STRERROR_R 1
+_ACEOF
 
 fi
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
+$as_echo_n "checking whether strerror_r returns char *... " >&6; }
+if ${ac_cv_func_strerror_r_char_p+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
-printf %s "checking whether strerror_r returns char *... " >&6; }
-if test ${ac_cv_func_strerror_r_char_p+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
     ac_cv_func_strerror_r_char_p=no
     if test $ac_cv_have_decl_strerror_r = yes; then
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <string.h>
+$ac_includes_default
 int
-main (void)
+main ()
 {
 
 	  char buf[100];
@@ -19853,21 +16813,49 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_func_strerror_r_char_p=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    else
+      # strerror_r is not declared.  Choose between
+      # systems that have relatively inaccessible declarations for the
+      # function.  BeOS and DEC UNIX 4.0 fall in this category, but the
+      # former has a strerror_r that returns char*, while the latter
+      # has a strerror_r that returns `int'.
+      # This test should segfault on the DEC system.
+      if test "$cross_compiling" = yes; then :
+  :
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+$ac_includes_default
+	extern char *strerror_r ();
+int
+main ()
+{
+char buf[100];
+	  char x = *strerror_r (0, buf, sizeof buf);
+	  return ! isalpha (x);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_strerror_r_char_p=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
 
     fi
-   ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
-printf "%s\n" "$ac_cv_func_strerror_r_char_p" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
+$as_echo "$ac_cv_func_strerror_r_char_p" >&6; }
 if test $ac_cv_func_strerror_r_char_p = yes; then
 
-printf "%s\n" "#define STRERROR_R_CHAR_P 1" >>confdefs.h
+$as_echo "#define STRERROR_R_CHAR_P 1" >>confdefs.h
 
 fi
 
@@ -19880,14 +16868,13 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how many arguments gethostbyname_r() takes" >&5
-printf %s "checking how many arguments gethostbyname_r() takes... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking how many arguments gethostbyname_r() takes" >&5
+$as_echo_n "checking how many arguments gethostbyname_r() takes... " >&6; }
+
+    if ${ac_cv_func_which_gethostbyname_r+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-    if test ${ac_cv_func_which_gethostbyname_r+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
 
 ################################################################
 
@@ -19906,7 +16893,7 @@
 /* end confdefs.h.  */
 #include <netdb.h>
 int
-main (void)
+main ()
 {
 
             char *name = "www.gnu.org";
@@ -19916,11 +16903,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_func_which_gethostbyname_r=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 #
 # SIX ARGUMENTS
@@ -19933,7 +16919,7 @@
 /* end confdefs.h.  */
 #include <netdb.h>
 int
-main (void)
+main ()
 {
 
             char *name = "www.gnu.org";
@@ -19947,11 +16933,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_func_which_gethostbyname_r=six
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
@@ -19966,7 +16951,7 @@
 /* end confdefs.h.  */
 #include <netdb.h>
 int
-main (void)
+main ()
 {
 
             char *name = "www.gnu.org";
@@ -19980,11 +16965,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_func_which_gethostbyname_r=five
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
@@ -19999,7 +16983,7 @@
 /* end confdefs.h.  */
 #include <netdb.h>
 int
-main (void)
+main ()
 {
 
             char *name = "www.gnu.org";
@@ -20011,61 +16995,59 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_func_which_gethostbyname_r=three
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 fi
 
 ################################################################
 
- ;;
-esac
+
 fi
 
 case "$ac_cv_func_which_gethostbyname_r" in
     three|five|six)
 
-printf "%s\n" "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h
+$as_echo "#define HAVE_GETHOSTBYNAME_R 1" >>confdefs.h
 
     ;;
 esac
 
 case "$ac_cv_func_which_gethostbyname_r" in
     three)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: three" >&5
-printf "%s\n" "three" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: three" >&5
+$as_echo "three" >&6; }
 
-printf "%s\n" "#define HAVE_FUNC_GETHOSTBYNAME_R_3 1" >>confdefs.h
+$as_echo "#define HAVE_FUNC_GETHOSTBYNAME_R_3 1" >>confdefs.h
 
     ;;
 
     five)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: five" >&5
-printf "%s\n" "five" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: five" >&5
+$as_echo "five" >&6; }
 
-printf "%s\n" "#define HAVE_FUNC_GETHOSTBYNAME_R_5 1" >>confdefs.h
+$as_echo "#define HAVE_FUNC_GETHOSTBYNAME_R_5 1" >>confdefs.h
 
     ;;
 
     six)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: six" >&5
-printf "%s\n" "six" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: six" >&5
+$as_echo "six" >&6; }
 
-printf "%s\n" "#define HAVE_FUNC_GETHOSTBYNAME_R_6 1" >>confdefs.h
+$as_echo "#define HAVE_FUNC_GETHOSTBYNAME_R_6 1" >>confdefs.h
 
     ;;
 
     no)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: cannot find function declaration in netdb.h" >&5
-printf "%s\n" "cannot find function declaration in netdb.h" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot find function declaration in netdb.h" >&5
+$as_echo "cannot find function declaration in netdb.h" >&6; }
     ;;
 
     unknown)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: can't tell" >&5
-printf "%s\n" "can't tell" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: can't tell" >&5
+$as_echo "can't tell" >&6; }
     ;;
 
     *)
@@ -20087,140 +17069,118 @@
   unset ac_cv_lib_rt_nanosleep
   unset ac_cv_lib_rt___nanosleep
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lrt" >&5
-printf %s "checking for nanosleep in -lrt... " >&6; }
-if test ${ac_cv_lib_rt_nanosleep+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lrt" >&5
+$as_echo_n "checking for nanosleep in -lrt... " >&6; }
+if ${ac_cv_lib_rt_nanosleep+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char nanosleep (void);
+char nanosleep ();
 int
-main (void)
+main ()
 {
 return nanosleep ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_rt_nanosleep=yes
-else case e in #(
-  e) ac_cv_lib_rt_nanosleep=no ;;
-esac
+else
+  ac_cv_lib_rt_nanosleep=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_nanosleep" >&5
-printf "%s\n" "$ac_cv_lib_rt_nanosleep" >&6; }
-if test "x$ac_cv_lib_rt_nanosleep" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __nanosleep in -lrt" >&5
-printf %s "checking for __nanosleep in -lrt... " >&6; }
-if test ${ac_cv_lib_rt___nanosleep+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __nanosleep in -lrt" >&5
+$as_echo_n "checking for __nanosleep in -lrt... " >&6; }
+if ${ac_cv_lib_rt___nanosleep+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __nanosleep (void);
+char __nanosleep ();
 int
-main (void)
+main ()
 {
 return __nanosleep ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_rt___nanosleep=yes
-else case e in #(
-  e) ac_cv_lib_rt___nanosleep=no ;;
-esac
+else
+  ac_cv_lib_rt___nanosleep=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt___nanosleep" >&5
-printf "%s\n" "$ac_cv_lib_rt___nanosleep" >&6; }
-if test "x$ac_cv_lib_rt___nanosleep" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -20238,10 +17198,10 @@
 
 
 
-printf "%s\n" "#define HAVE_NANOSLEEP 1" >>confdefs.h
+$as_echo "#define HAVE_NANOSLEEP 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBRT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBRT 1" >>confdefs.h
 
     ac_cv_func_nanosleep=yes
   else
@@ -20257,140 +17217,118 @@
   unset ac_cv_lib_network_setsockopt
   unset ac_cv_lib_network___setsockopt
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for setsockopt in -lnetwork" >&5
-printf %s "checking for setsockopt in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network_setsockopt+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for setsockopt in -lnetwork" >&5
+$as_echo_n "checking for setsockopt in -lnetwork... " >&6; }
+if ${ac_cv_lib_network_setsockopt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char setsockopt (void);
+char setsockopt ();
 int
-main (void)
+main ()
 {
 return setsockopt ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network_setsockopt=yes
-else case e in #(
-  e) ac_cv_lib_network_setsockopt=no ;;
-esac
+else
+  ac_cv_lib_network_setsockopt=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_setsockopt" >&5
-printf "%s\n" "$ac_cv_lib_network_setsockopt" >&6; }
-if test "x$ac_cv_lib_network_setsockopt" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network_setsockopt" >&5
+$as_echo "$ac_cv_lib_network_setsockopt" >&6; }
+if test "x$ac_cv_lib_network_setsockopt" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __setsockopt in -lnetwork" >&5
-printf %s "checking for __setsockopt in -lnetwork... " >&6; }
-if test ${ac_cv_lib_network___setsockopt+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __setsockopt in -lnetwork" >&5
+$as_echo_n "checking for __setsockopt in -lnetwork... " >&6; }
+if ${ac_cv_lib_network___setsockopt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnetwork  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __setsockopt (void);
+char __setsockopt ();
 int
-main (void)
+main ()
 {
 return __setsockopt ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_network___setsockopt=yes
-else case e in #(
-  e) ac_cv_lib_network___setsockopt=no ;;
-esac
+else
+  ac_cv_lib_network___setsockopt=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___setsockopt" >&5
-printf "%s\n" "$ac_cv_lib_network___setsockopt" >&6; }
-if test "x$ac_cv_lib_network___setsockopt" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_network___setsockopt" >&5
+$as_echo "$ac_cv_lib_network___setsockopt" >&6; }
+if test "x$ac_cv_lib_network___setsockopt" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lnetwork"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -20408,10 +17346,10 @@
 
 
 
-printf "%s\n" "#define HAVE_SETSOCKOPT 1" >>confdefs.h
+$as_echo "#define HAVE_SETSOCKOPT 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBNETWORK 1" >>confdefs.h
+$as_echo "#define HAVE_LIBNETWORK 1" >>confdefs.h
 
     ac_cv_func_setsockopt=yes
   else
@@ -20422,27 +17360,24 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5
-printf %s "checking for getaddrinfo... " >&6; }
-if test ${ac_cv_func_getaddrinfo+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getaddrinfo" >&5
+$as_echo_n "checking for getaddrinfo... " >&6; }
+if ${ac_cv_func_getaddrinfo+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <netdb.h>
 int
-main (void)
+main ()
 {
 struct addrinfo *g,h;g=&h;getaddrinfo("","",g,&g);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
-  if test "$cross_compiling" = yes
-then :
+if ac_fn_c_try_link "$LINENO"; then :
+  if test "$cross_compiling" = yes; then :
 
         case $host_alias in
       *linux*)
@@ -20453,8 +17388,8 @@
         ;;
     esac
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <string.h>
@@ -20497,45 +17432,38 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_getaddrinfo=yes
-else case e in #(
-  e) ac_cv_func_getaddrinfo=no ;;
-esac
+else
+  ac_cv_func_getaddrinfo=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-else case e in #(
-  e) ac_cv_func_getaddrinfo=no ;;
-esac
+else
+  ac_cv_func_getaddrinfo=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_getaddrinfo" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_GETADDRINFO 1" >>confdefs.h
+$as_echo "#define HAVE_GETADDRINFO 1" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for copy_file_range" >&5
-printf %s "checking for copy_file_range... " >&6; }
-if test ${ac_cv_copy_file_range+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test "$cross_compiling" = yes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for copy_file_range" >&5
+$as_echo_n "checking for copy_file_range... " >&6; }
+if ${ac_cv_copy_file_range+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
   ac_cv_copy_file_range=no
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #ifdef __linux__
@@ -20558,100 +17486,91 @@
 #endif
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_copy_file_range=yes
-else case e in #(
-  e) ac_cv_copy_file_range=no ;;
-esac
+else
+  ac_cv_copy_file_range=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_copy_file_range" >&5
-printf "%s\n" "$ac_cv_copy_file_range" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_copy_file_range" >&5
+$as_echo "$ac_cv_copy_file_range" >&6; }
 
 if test "$ac_cv_copy_file_range" = yes; then
 
-printf "%s\n" "#define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
+$as_echo "#define HAVE_COPY_FILE_RANGE 1" >>confdefs.h
 
 fi
 
 ac_fn_c_check_func "$LINENO" "strlcat" "ac_cv_func_strlcat"
-if test "x$ac_cv_func_strlcat" = xyes
-then :
-  printf "%s\n" "#define HAVE_STRLCAT 1" >>confdefs.h
+if test "x$ac_cv_func_strlcat" = xyes; then :
+  $as_echo "#define HAVE_STRLCAT 1" >>confdefs.h
 
-else case e in #(
-  e) case " $LIBOBJS " in
+else
+  case " $LIBOBJS " in
   *" strlcat.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS strlcat.$ac_objext"
  ;;
 esac
- ;;
-esac
+
 fi
+
 ac_fn_c_check_func "$LINENO" "strlcpy" "ac_cv_func_strlcpy"
-if test "x$ac_cv_func_strlcpy" = xyes
-then :
-  printf "%s\n" "#define HAVE_STRLCPY 1" >>confdefs.h
+if test "x$ac_cv_func_strlcpy" = xyes; then :
+  $as_echo "#define HAVE_STRLCPY 1" >>confdefs.h
 
-else case e in #(
-  e) case " $LIBOBJS " in
+else
+  case " $LIBOBJS " in
   *" strlcpy.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS strlcpy.$ac_objext"
  ;;
 esac
- ;;
-esac
+
 fi
+
 ac_fn_c_check_func "$LINENO" "explicit_bzero" "ac_cv_func_explicit_bzero"
-if test "x$ac_cv_func_explicit_bzero" = xyes
-then :
-  printf "%s\n" "#define HAVE_EXPLICIT_BZERO 1" >>confdefs.h
+if test "x$ac_cv_func_explicit_bzero" = xyes; then :
+  $as_echo "#define HAVE_EXPLICIT_BZERO 1" >>confdefs.h
 
-else case e in #(
-  e) case " $LIBOBJS " in
+else
+  case " $LIBOBJS " in
   *" explicit_bzero.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS explicit_bzero.$ac_objext"
  ;;
 esac
- ;;
-esac
+
 fi
+
 ac_fn_c_check_func "$LINENO" "getopt" "ac_cv_func_getopt"
-if test "x$ac_cv_func_getopt" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETOPT 1" >>confdefs.h
+if test "x$ac_cv_func_getopt" = xyes; then :
+  $as_echo "#define HAVE_GETOPT 1" >>confdefs.h
 
-else case e in #(
-  e) case " $LIBOBJS " in
+else
+  case " $LIBOBJS " in
   *" getopt.$ac_objext "* ) ;;
   *) LIBOBJS="$LIBOBJS getopt.$ac_objext"
  ;;
 esac
- ;;
-esac
+
 fi
 
+
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
-printf %s "checking for working alloca.h... " >&6; }
-if test ${ac_cv_working_alloca_h+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+$as_echo_n "checking for working alloca.h... " >&6; }
+if ${ac_cv_working_alloca_h+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <alloca.h>
 int
-main (void)
+main ()
 {
 char *p = (char *) alloca (2 * sizeof (int));
 			  if (p) return 0;
@@ -20659,54 +17578,52 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_working_alloca_h=yes
-else case e in #(
-  e) ac_cv_working_alloca_h=no ;;
-esac
+else
+  ac_cv_working_alloca_h=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_ALLOCA_H 1" >>confdefs.h
+$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
-printf %s "checking for alloca... " >&6; }
-if test ${ac_cv_func_alloca_works+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_func_alloca_works=$ac_cv_working_alloca_h
-if test "$ac_cv_func_alloca_works" != yes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+$as_echo_n "checking for alloca... " >&6; }
+if ${ac_cv_func_alloca_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <stdlib.h>
-#include <stddef.h>
-#ifndef alloca
-# ifdef __GNUC__
-#  define alloca __builtin_alloca
-# elif defined _MSC_VER
+#ifdef __GNUC__
+# define alloca __builtin_alloca
+#else
+# ifdef _MSC_VER
 #  include <malloc.h>
 #  define alloca _alloca
 # else
-#  ifdef  __cplusplus
-extern "C"
-#  endif
+#  ifdef HAVE_ALLOCA_H
+#   include <alloca.h>
+#  else
+#   ifdef _AIX
+ #pragma alloca
+#   else
+#    ifndef alloca /* predefined by HP cc +Olibcalls */
 void *alloca (size_t);
+#    endif
+#   endif
+#  endif
 # endif
 #endif
 
 int
-main (void)
+main ()
 {
 char *p = (char *) alloca (1);
 				    if (p) return 0;
@@ -20714,21 +17631,20 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_func_alloca_works=yes
+else
+  ac_cv_func_alloca_works=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-fi ;;
-esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_ALLOCA 1" >>confdefs.h
+$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
 
 else
   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
@@ -20738,20 +17654,59 @@
 
 ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
 
-printf "%s\n" "#define C_ALLOCA 1" >>confdefs.h
+$as_echo "#define C_ALLOCA 1" >>confdefs.h
+
+
+{ $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 ${ac_cv_os_cray+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#if defined CRAY && ! defined CRAY2
+webecray
+#else
+wenotbecray
+#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "webecray" >/dev/null 2>&1; then :
+  ac_cv_os_cray=yes
+else
+  ac_cv_os_cray=no
+fi
+rm -f conftest*
+
+fi
+{ $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=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+
+cat >>confdefs.h <<_ACEOF
+#define CRAY_STACKSEG_END $ac_func
+_ACEOF
+
+    break
+fi
 
+  done
+fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
-printf %s "checking stack direction for C alloca... " >&6; }
-if test ${ac_cv_c_stack_direction+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test "$cross_compiling" = yes
-then :
+{ $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 ${ac_cv_c_stack_direction+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
   ac_cv_c_stack_direction=0
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 $ac_includes_default
 int
@@ -20771,42 +17726,38 @@
   return find_stack_direction (0, argc + !argv + 20) < 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_c_stack_direction=1
-else case e in #(
-  e) ac_cv_c_stack_direction=-1 ;;
-esac
+else
+  ac_cv_c_stack_direction=-1
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-printf "%s\n" "$ac_cv_c_stack_direction" >&6; }
-printf "%s\n" "#define STACK_DIRECTION $ac_cv_c_stack_direction" >>confdefs.h
+{ $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
 
 
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for type of reentrant time-related functions" >&5
-printf %s "checking for type of reentrant time-related functions... " >&6; }
-if test ${ac_cv_time_r_type+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-if test "$cross_compiling" = yes
-then :
+{ $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 ${ac_cv_time_r_type+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+if test "$cross_compiling" = yes; then :
 
   ac_cv_time_r_type=POSIX
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <time.h>
@@ -20824,20 +17775,18 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_time_r_type=hpux
 
-else case e in #(
-  e)
-  if test "$cross_compiling" = yes
-then :
+else
+
+  if test "$cross_compiling" = yes; then :
 
     ac_cv_time_r_type=POSIX
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <time.h>
@@ -20853,52 +17802,45 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_time_r_type=irix
 
-else case e in #(
-  e)
+else
+
     ac_cv_time_r_type=POSIX
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
- ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_time_r_type" >&5
-printf "%s\n" "$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)
-printf "%s\n" "#define PHP_HPUX_TIME_R 1" >>confdefs.h
+$as_echo "#define PHP_HPUX_TIME_R 1" >>confdefs.h
  ;;
   irix)
-printf "%s\n" "#define PHP_IRIX_TIME_R 1" >>confdefs.h
+$as_echo "#define PHP_IRIX_TIME_R 1" >>confdefs.h
  ;;
   esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for in_addr_t" >&5
-printf %s "checking for in_addr_t... " >&6; }
-if test ${ac_cv_type_in_addr_t+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for in_addr_t" >&5
+$as_echo_n "checking for in_addr_t... " >&6; }
+if ${ac_cv_type_in_addr_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <sys/types.h>
 #include <stdlib.h>
@@ -20908,33 +17850,29 @@
 #endif
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "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 case e in #(
-  e) ac_cv_type_in_addr_t=no ;;
-esac
+else
+  ac_cv_type_in_addr_t=no
 fi
-rm -rf conftest*
- ;;
-esac
+rm -f conftest*
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_in_addr_t" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define in_addr_t u_int" >>confdefs.h
+$as_echo "#define in_addr_t u_int" >>confdefs.h
 
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for aarch64 CRC32 API" >&5
-printf %s "checking for aarch64 CRC32 API... " >&6; }
-if test ${ac_cv_func___crc32d+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for aarch64 CRC32 API" >&5
+$as_echo_n "checking for aarch64 CRC32 API... " >&6; }
+if ${ac_cv_func___crc32d+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <arm_acle.h>
@@ -20950,41 +17888,35 @@
 # endif
 
 int
-main (void)
+main ()
 {
 __crc32d(0, 0);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_func___crc32d=yes
-else case e in #(
-  e) ac_cv_func___crc32d=no ;;
-esac
+else
+  ac_cv_func___crc32d=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
-    conftest$ac_exeext conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func___crc32d" >&5
-printf "%s\n" "$ac_cv_func___crc32d" >&6; }
-if test "x$ac_cv_func___crc32d" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func___crc32d" >&5
+$as_echo "$ac_cv_func___crc32d" >&6; }
+if test "x$ac_cv_func___crc32d" = xyes; then :
 
-printf "%s\n" "#define HAVE_AARCH64_CRC32 1" >>confdefs.h
+$as_echo "#define HAVE_AARCH64_CRC32 1" >>confdefs.h
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for asm goto" >&5
-printf %s "checking for asm goto... " >&6; }
-if test ${ac_cv__asm_goto+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test "$cross_compiling" = yes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for asm goto" >&5
+$as_echo_n "checking for asm goto... " >&6; }
+if ${ac_cv__asm_goto+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
 
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -21000,17 +17932,15 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv__asm_goto=yes
-else case e in #(
-  e) ac_cv__asm_goto=no ;;
-esac
+else
+  ac_cv__asm_goto=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int main(void) {
@@ -21024,51 +17954,45 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv__asm_goto=yes
-else case e in #(
-  e) ac_cv__asm_goto=no ;;
-esac
+else
+  ac_cv__asm_goto=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv__asm_goto" >&5
-printf "%s\n" "$ac_cv__asm_goto" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv__asm_goto" >&5
+$as_echo "$ac_cv__asm_goto" >&6; }
 
 if test "$ac_cv__asm_goto" = yes; then
 
-printf "%s\n" "#define HAVE_ASM_GOTO 1" >>confdefs.h
+$as_echo "#define HAVE_ASM_GOTO 1" >>confdefs.h
 
 fi
 
 
 php_with_valgrind=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable valgrind support" >&5
-printf %s "checking whether to enable valgrind support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable valgrind support" >&5
+$as_echo_n "checking whether to enable valgrind support... " >&6; }
 
 # Check whether --with-valgrind was given.
-if test ${with_valgrind+y}
-then :
+if test "${with_valgrind+set}" = set; then :
   withval=$with_valgrind; PHP_VALGRIND=$withval
-else case e in #(
-  e)
+else
+
   PHP_VALGRIND=yes
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_VALGRIND
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -21076,17 +18000,17 @@
 if test "$PHP_VALGRIND" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for valgrind" >&5
-printf %s "checking for valgrind... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for valgrind" >&5
+$as_echo_n "checking for valgrind... " >&6; }
 
 if test -n "$VALGRIND_CFLAGS"; then
     pkg_cv_VALGRIND_CFLAGS="$VALGRIND_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"valgrind\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"valgrind\""; } >&5
   ($PKG_CONFIG --exists --print-errors "valgrind") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_VALGRIND_CFLAGS=`$PKG_CONFIG --cflags "valgrind" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -21100,10 +18024,10 @@
     pkg_cv_VALGRIND_LIBS="$VALGRIND_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"valgrind\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"valgrind\""; } >&5
   ($PKG_CONFIG --exists --print-errors "valgrind") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_VALGRIND_LIBS=`$PKG_CONFIG --libs "valgrind" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -21117,8 +18041,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -21135,14 +18059,14 @@
 
 	have_valgrind="no"
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	have_valgrind="no"
 else
 	VALGRIND_CFLAGS=$pkg_cv_VALGRIND_CFLAGS
 	VALGRIND_LIBS=$pkg_cv_VALGRIND_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	have_valgrind="yes"
 fi
 
@@ -21188,7 +18112,7 @@
   done
 
 
-printf "%s\n" "#define HAVE_VALGRIND 1" >>confdefs.h
+$as_echo "#define HAVE_VALGRIND 1" >>confdefs.h
 
   else
     if test "$with_valgrind" = "yes"; then
@@ -21203,27 +18127,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "openpty" "ac_cv_func_openpty"
-if test "x$ac_cv_func_openpty" = xyes
-then :
+if test "x$ac_cv_func_openpty" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__openpty" "ac_cv_func___openpty"
-if test "x$ac_cv_func___openpty" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__openpty" "ac_cv_func___openpty"
+if test "x$ac_cv_func___openpty" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_OPENPTY 1" >>confdefs.h
+$as_echo "#define HAVE_OPENPTY 1" >>confdefs.h
 
     ac_cv_func_openpty=yes
   ;;
@@ -21233,140 +18153,118 @@
   unset ac_cv_lib_util_openpty
   unset ac_cv_lib_util___openpty
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5
-printf %s "checking for openpty in -lutil... " >&6; }
-if test ${ac_cv_lib_util_openpty+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lutil" >&5
+$as_echo_n "checking for openpty in -lutil... " >&6; }
+if ${ac_cv_lib_util_openpty+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char openpty (void);
+char openpty ();
 int
-main (void)
+main ()
 {
 return openpty ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_util_openpty=yes
-else case e in #(
-  e) ac_cv_lib_util_openpty=no ;;
-esac
+else
+  ac_cv_lib_util_openpty=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_openpty" >&5
-printf "%s\n" "$ac_cv_lib_util_openpty" >&6; }
-if test "x$ac_cv_lib_util_openpty" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_openpty" >&5
+$as_echo "$ac_cv_lib_util_openpty" >&6; }
+if test "x$ac_cv_lib_util_openpty" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __openpty in -lutil" >&5
-printf %s "checking for __openpty in -lutil... " >&6; }
-if test ${ac_cv_lib_util___openpty+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __openpty in -lutil" >&5
+$as_echo_n "checking for __openpty in -lutil... " >&6; }
+if ${ac_cv_lib_util___openpty+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lutil  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __openpty (void);
+char __openpty ();
 int
-main (void)
+main ()
 {
 return __openpty ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_util___openpty=yes
-else case e in #(
-  e) ac_cv_lib_util___openpty=no ;;
-esac
+else
+  ac_cv_lib_util___openpty=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util___openpty" >&5
-printf "%s\n" "$ac_cv_lib_util___openpty" >&6; }
-if test "x$ac_cv_lib_util___openpty" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util___openpty" >&5
+$as_echo "$ac_cv_lib_util___openpty" >&6; }
+if test "x$ac_cv_lib_util___openpty" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lutil"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -21384,10 +18282,10 @@
 
 
 
-printf "%s\n" "#define HAVE_OPENPTY 1" >>confdefs.h
+$as_echo "#define HAVE_OPENPTY 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBUTIL 1" >>confdefs.h
+$as_echo "#define HAVE_LIBUTIL 1" >>confdefs.h
 
     ac_cv_func_openpty=yes
   else
@@ -21396,140 +18294,118 @@
   unset ac_cv_lib_bsd_openpty
   unset ac_cv_lib_bsd___openpty
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openpty in -lbsd" >&5
-printf %s "checking for openpty in -lbsd... " >&6; }
-if test ${ac_cv_lib_bsd_openpty+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openpty in -lbsd" >&5
+$as_echo_n "checking for openpty in -lbsd... " >&6; }
+if ${ac_cv_lib_bsd_openpty+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char openpty (void);
+char openpty ();
 int
-main (void)
+main ()
 {
 return openpty ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bsd_openpty=yes
-else case e in #(
-  e) ac_cv_lib_bsd_openpty=no ;;
-esac
+else
+  ac_cv_lib_bsd_openpty=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_openpty" >&5
-printf "%s\n" "$ac_cv_lib_bsd_openpty" >&6; }
-if test "x$ac_cv_lib_bsd_openpty" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_openpty" >&5
+$as_echo "$ac_cv_lib_bsd_openpty" >&6; }
+if test "x$ac_cv_lib_bsd_openpty" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __openpty in -lbsd" >&5
-printf %s "checking for __openpty in -lbsd... " >&6; }
-if test ${ac_cv_lib_bsd___openpty+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __openpty in -lbsd" >&5
+$as_echo_n "checking for __openpty in -lbsd... " >&6; }
+if ${ac_cv_lib_bsd___openpty+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __openpty (void);
+char __openpty ();
 int
-main (void)
+main ()
 {
 return __openpty ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bsd___openpty=yes
-else case e in #(
-  e) ac_cv_lib_bsd___openpty=no ;;
-esac
+else
+  ac_cv_lib_bsd___openpty=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd___openpty" >&5
-printf "%s\n" "$ac_cv_lib_bsd___openpty" >&6; }
-if test "x$ac_cv_lib_bsd___openpty" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd___openpty" >&5
+$as_echo "$ac_cv_lib_bsd___openpty" >&6; }
+if test "x$ac_cv_lib_bsd___openpty" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lbsd"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -21547,10 +18423,10 @@
 
 
 
-printf "%s\n" "#define HAVE_OPENPTY 1" >>confdefs.h
+$as_echo "#define HAVE_OPENPTY 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBBSD 1" >>confdefs.h
+$as_echo "#define HAVE_LIBBSD 1" >>confdefs.h
 
     ac_cv_func_openpty=yes
   else
@@ -21568,16 +18444,15 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}General settings${T_ME}" >&5
-printf "%s\n" "${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_+y}
-then :
+if test "${enable_+set}" = set; then :
   enableval=$enable_;
 fi
 
@@ -21586,24 +18461,22 @@
 
 php_enable_gcov=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to include gcov symbols" >&5
-printf %s "checking whether to include gcov symbols... " >&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+y}
-then :
+if test "${enable_gcov+set}" = set; then :
   enableval=$enable_gcov; PHP_GCOV=$enableval
-else case e in #(
-  e)
+else
+
   PHP_GCOV=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_GCOV
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -21624,7 +18497,7 @@
   fi
 
 
-printf "%s\n" "#define HAVE_GCOV 1" >>confdefs.h
+$as_echo "#define HAVE_GCOV 1" >>confdefs.h
 
 
   src=$abs_srcdir/build/Makefile.gcov
@@ -21646,24 +18519,22 @@
 
 php_enable_debug=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to include debugging symbols" >&5
-printf %s "checking whether to include debugging symbols... " >&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+y}
-then :
+if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug; PHP_DEBUG=$enableval
-else case e in #(
-  e)
+else
+
   PHP_DEBUG=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_DEBUG
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -21697,24 +18568,22 @@
 
 php_enable_debug_assertions=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable debug assertions in release mode" >&5
-printf %s "checking whether to enable debug assertions in release mode... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable debug assertions in release mode" >&5
+$as_echo_n "checking whether to enable debug assertions in release mode... " >&6; }
 # Check whether --enable-debug-assertions was given.
-if test ${enable_debug_assertions+y}
-then :
+if test "${enable_debug_assertions+set}" = set; then :
   enableval=$enable_debug_assertions; PHP_DEBUG_ASSERTIONS=$enableval
-else case e in #(
-  e)
+else
+
   PHP_DEBUG_ASSERTIONS=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_DEBUG_ASSERTIONS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -21725,18 +18594,16 @@
 fi
 
 # Check whether --enable-zts was given.
-if test ${enable_zts+y}
-then :
+if test "${enable_zts+set}" = set; then :
   enableval=$enable_zts; ZEND_ZTS=$enableval
-else case e in #(
-  e) ZEND_ZTS=no ;;
-esac
+else
+  ZEND_ZTS=no
 fi
 
 
 if test "$ZEND_ZTS" = "yes"; then
 
-printf "%s\n" "#define ZTS 1" >>confdefs.h
+$as_echo "#define ZTS 1" >>confdefs.h
 
   PHP_THREAD_SAFETY=yes
 else
@@ -21746,56 +18613,52 @@
 
 php_enable_rtld_now=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY" >&5
-printf %s "checking whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY" >&5
+$as_echo_n "checking whether to dlopen extensions with RTLD_NOW instead of RTLD_LAZY... " >&6; }
 # Check whether --enable-rtld-now was given.
-if test ${enable_rtld_now+y}
-then :
+if test "${enable_rtld_now+set}" = set; then :
   enableval=$enable_rtld_now; PHP_RTLD_NOW=$enableval
-else case e in #(
-  e)
+else
+
   PHP_RTLD_NOW=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_RTLD_NOW
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 
 if test "$PHP_RTLD_NOW" = "yes"; then
 
-printf "%s\n" "#define PHP_USE_RTLD_NOW 1" >>confdefs.h
+$as_echo "#define PHP_USE_RTLD_NOW 1" >>confdefs.h
 
 fi
 
 
 php_with_layout=PHP
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking layout of installed files" >&5
-printf %s "checking layout of installed files... " >&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+y}
-then :
+if test "${with_layout+set}" = set; then :
   withval=$with_layout; PHP_LAYOUT=$withval
-else case e in #(
-  e)
+else
+
   PHP_LAYOUT=PHP
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_LAYOUT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -21812,25 +18675,23 @@
 
 php_with_config_file_path=DEFAULT
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking path to configuration file" >&5
-printf %s "checking path to configuration file... " >&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+y}
-then :
+if test "${with_config_file_path+set}" = set; then :
   withval=$with_config_file_path; PHP_CONFIG_FILE_PATH=$withval
-else case e in #(
-  e)
+else
+
   PHP_CONFIG_FILE_PATH=DEFAULT
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_CONFIG_FILE_PATH
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -21846,23 +18707,21 @@
   esac
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where to scan for configuration files" >&5
-printf %s "checking where to scan for configuration files... " >&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+y}
-then :
+if test "${with_config_file_scan_dir+set}" = set; then :
   withval=$with_config_file_scan_dir; PHP_CONFIG_FILE_SCAN_DIR=$withval
-else case e in #(
-  e)
+else
+
   PHP_CONFIG_FILE_SCAN_DIR=DEFAULT
 
- ;;
-esac
+
 fi
 
 
@@ -21875,67 +18734,63 @@
 if test "$PHP_CONFIG_FILE_SCAN_DIR" = "DEFAULT"; then
   PHP_CONFIG_FILE_SCAN_DIR=
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_CONFIG_FILE_SCAN_DIR" >&5
-printf "%s\n" "$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
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable PHP's own SIGCHLD handler" >&5
-printf %s "checking whether to enable PHP's own SIGCHLD handler... " >&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+y}
-then :
+if test "${enable_sigchild+set}" = set; then :
   enableval=$enable_sigchild; PHP_SIGCHILD=$enableval
-else case e in #(
-  e)
+else
+
   PHP_SIGCHILD=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_SIGCHILD
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define PHP_SIGCHILD 1" >>confdefs.h
+$as_echo "#define PHP_SIGCHILD 1" >>confdefs.h
 
 else
 
-printf "%s\n" "#define PHP_SIGCHILD 0" >>confdefs.h
+$as_echo "#define PHP_SIGCHILD 0" >>confdefs.h
 
 fi
 
 
 php_enable_libgcc=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to explicitly link against libgcc" >&5
-printf %s "checking whether to explicitly link against libgcc... " >&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+y}
-then :
+if test "${enable_libgcc+set}" = set; then :
   enableval=$enable_libgcc; PHP_LIBGCC=$enableval
-else case e in #(
-  e)
+else
+
   PHP_LIBGCC=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_LIBGCC
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -21997,109 +18852,97 @@
 
 php_enable_short_tags=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable short tags by default" >&5
-printf %s "checking whether to enable short tags by default... " >&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+y}
-then :
+if test "${enable_short_tags+set}" = set; then :
   enableval=$enable_short_tags; PHP_SHORT_TAGS=$enableval
-else case e in #(
-  e)
+else
+
   PHP_SHORT_TAGS=yes
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_SHORT_TAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define DEFAULT_SHORT_OPEN_TAG \"1\"" >>confdefs.h
+$as_echo "#define DEFAULT_SHORT_OPEN_TAG \"1\"" >>confdefs.h
 
 else
 
-printf "%s\n" "#define DEFAULT_SHORT_OPEN_TAG \"0\"" >>confdefs.h
+$as_echo "#define DEFAULT_SHORT_OPEN_TAG \"0\"" >>confdefs.h
 
 fi
 
 
 php_enable_dmalloc=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable dmalloc" >&5
-printf %s "checking whether to enable dmalloc... " >&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+y}
-then :
+if test "${enable_dmalloc+set}" = set; then :
   enableval=$enable_dmalloc; PHP_DMALLOC=$enableval
-else case e in #(
-  e)
+else
+
   PHP_DMALLOC=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_DMALLOC
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$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
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dmalloc_error in -ldmalloc" >&5
-printf %s "checking for dmalloc_error in -ldmalloc... " >&6; }
-if test ${ac_cv_lib_dmalloc_dmalloc_error+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_dmalloc_dmalloc_error+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldmalloc  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dmalloc_error (void);
+char dmalloc_error ();
 int
-main (void)
+main ()
 {
 return dmalloc_error ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dmalloc_dmalloc_error=yes
-else case e in #(
-  e) ac_cv_lib_dmalloc_dmalloc_error=no ;;
-esac
+else
+  ac_cv_lib_dmalloc_dmalloc_error=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dmalloc_dmalloc_error" >&5
-printf "%s\n" "$ac_cv_lib_dmalloc_dmalloc_error" >&6; }
-if test "x$ac_cv_lib_dmalloc_dmalloc_error" = xyes
-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" = xyes; then :
 
 
 
@@ -22112,15 +18955,14 @@
 
 
 
-printf "%s\n" "#define HAVE_DMALLOC 1" >>confdefs.h
+$as_echo "#define HAVE_DMALLOC 1" >>confdefs.h
 
     CPPFLAGS="$CPPFLAGS -DDMALLOC_FUNC_CHECK"
 
-else case e in #(
-  e)
+else
+
     as_fn_error $? "Problem with enabling dmalloc. Please check config.log for details." "$LINENO" 5
-   ;;
-esac
+
 fi
 
 fi
@@ -22128,66 +18970,63 @@
 
 php_enable_ipv6=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable IPv6 support" >&5
-printf %s "checking whether to enable IPv6 support... " >&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+y}
-then :
+if test "${enable_ipv6+set}" = set; then :
   enableval=$enable_ipv6; PHP_IPV6=$enableval
-else case e in #(
-  e)
+else
+
   PHP_IPV6=yes
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_IPV6
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_IPV6 1" >>confdefs.h
+$as_echo "#define HAVE_IPV6 1" >>confdefs.h
 
 fi
 
 
 php_enable_dtrace=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable DTrace support" >&5
-printf %s "checking whether to enable DTrace support... " >&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+y}
-then :
+if test "${enable_dtrace+set}" = set; then :
   enableval=$enable_dtrace; PHP_DTRACE=$enableval
-else case e in #(
-  e)
+else
+
   PHP_DTRACE=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_DTRACE
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$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
+  for ac_header in sys/sdt.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "sys/sdt.h" "ac_cv_header_sys_sdt_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sdt_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_SDT_H 1" >>confdefs.h
+  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" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_SDT_H 1
+_ACEOF
 
 
   case "" in
@@ -22289,38 +19128,36 @@
   esac
 
 
-printf "%s\n" "#define HAVE_DTRACE 1" >>confdefs.h
+$as_echo "#define HAVE_DTRACE 1" >>confdefs.h
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_DTRACE_OBJS"
 
 
-else case e in #(
-  e)
+else
+
     as_fn_error $? "Cannot find sys/sdt.h which is required for DTrace support" "$LINENO" 5
-   ;;
-esac
+
 fi
 
 done
+
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how big to make fd sets" >&5
-printf %s "checking how big to make fd sets... " >&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+y}
-then :
+if test "${enable_fd_setsize+set}" = set; then :
   enableval=$enable_fd_setsize; PHP_FD_SETSIZE=$enableval
-else case e in #(
-  e)
+else
+
   PHP_FD_SETSIZE=no
 
- ;;
-esac
+
 fi
 
 
@@ -22333,14 +19170,14 @@
 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"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using $PHP_FD_SETSIZE" >&5
-printf "%s\n" "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
     as_fn_error $? "Invalid value passed to --enable-fd-setsize!" "$LINENO" 5
   fi
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: using system default" >&5
-printf "%s\n" "using system default" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: using system default" >&5
+$as_echo "using system default" >&6; }
 fi
 
 
@@ -22348,15 +19185,13 @@
 
 
 # Check whether --enable-werror was given.
-if test ${enable_werror+y}
-then :
+if test "${enable_werror+set}" = set; then :
   enableval=$enable_werror; PHP_WERROR=$enableval
-else case e in #(
-  e)
+else
+
   PHP_WERROR=no
 
- ;;
-esac
+
 fi
 
 
@@ -22370,15 +19205,13 @@
 
 
 # Check whether --enable-memory-sanitizer was given.
-if test ${enable_memory_sanitizer+y}
-then :
+if test "${enable_memory_sanitizer+set}" = set; then :
   enableval=$enable_memory_sanitizer; PHP_MEMORY_SANITIZER=$enableval
-else case e in #(
-  e)
+else
+
   PHP_MEMORY_SANITIZER=no
 
- ;;
-esac
+
 fi
 
 
@@ -22392,15 +19225,13 @@
 
 
 # Check whether --enable-address-sanitizer was given.
-if test ${enable_address_sanitizer+y}
-then :
+if test "${enable_address_sanitizer+set}" = set; then :
   enableval=$enable_address_sanitizer; PHP_ADDRESS_SANITIZER=$enableval
-else case e in #(
-  e)
+else
+
   PHP_ADDRESS_SANITIZER=no
 
- ;;
-esac
+
 fi
 
 
@@ -22414,15 +19245,13 @@
 
 
 # Check whether --enable-undefined-sanitizer was given.
-if test ${enable_undefined_sanitizer+y}
-then :
+if test "${enable_undefined_sanitizer+set}" = set; then :
   enableval=$enable_undefined_sanitizer; PHP_UNDEFINED_SANITIZER=$enableval
-else case e in #(
-  e)
+else
+
   PHP_UNDEFINED_SANITIZER=no
 
- ;;
-esac
+
 fi
 
 
@@ -22435,23 +19264,21 @@
 
 
 # Check whether --enable- was given.
-if test ${enable_+y}
-then :
+if test "${enable_+set}" = set; then :
   enableval=$enable_;
 fi
 
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring extensions${T_ME}" >&5
-printf "%s\n" "${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+y}
-then :
+if test "${enable_all+set}" = set; then :
   enableval=$enable_all; PHP_ENABLE_ALL=$enableval
 fi
 
@@ -22459,67 +19286,65 @@
 
 
 
-ac_fn_c_check_header_compile "$LINENO" "io.h" "ac_cv_header_io_h" "$ac_includes_default"
-if test "x$ac_cv_header_io_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_IO_H 1" >>confdefs.h
+for ac_header in io.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "io.h" "ac_cv_header_io_h" "$ac_includes_default"
+if test "x$ac_cv_header_io_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_IO_H 1
+_ACEOF
 
 fi
 
+done
 
-ac_fn_c_check_func "$LINENO" "strtoll" "ac_cv_func_strtoll"
-if test "x$ac_cv_func_strtoll" = xyes
-then :
-  printf "%s\n" "#define HAVE_STRTOLL 1" >>confdefs.h
 
-fi
-ac_fn_c_check_func "$LINENO" "atoll" "ac_cv_func_atoll"
-if test "x$ac_cv_func_atoll" = xyes
-then :
-  printf "%s\n" "#define HAVE_ATOLL 1" >>confdefs.h
+for ac_func in strtoll atoll
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
+done
+
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-implicit-fallthrough" >&5
+$as_echo_n "checking whether C compiler accepts -Wno-implicit-fallthrough... " >&6; }
+if ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-implicit-fallthrough" >&5
-printf %s "checking whether C compiler accepts -Wno-implicit-fallthrough... " >&6; }
-if test ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wno-implicit-fallthrough"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5
+$as_echo "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes; then :
   PHP_DATE_CFLAGS="$PHP_DATE_CFLAGS -Wno-implicit-fallthrough"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
 
@@ -22661,7 +19486,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_DATE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_DATE 1
+_ACEOF
 
     fi
   fi
@@ -22872,7 +19699,7 @@
 
 
 
-printf "%s\n" "#define HAVE_TIMELIB_CONFIG_H 1" >>confdefs.h
+$as_echo "#define HAVE_TIMELIB_CONFIG_H 1" >>confdefs.h
 
 
 cat > $ext_builddir/lib/timelib_config.h <<EOF
@@ -22900,19 +19727,17 @@
 
 php_with_libxml=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with LIBXML support" >&5
-printf %s "checking whether to build with LIBXML support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with LIBXML support" >&5
+$as_echo_n "checking whether to build with LIBXML support... " >&6; }
 
 # Check whether --with-libxml was given.
-if test ${with_libxml+y}
-then :
+if test "${with_libxml+set}" = set; then :
   withval=$with_libxml; PHP_LIBXML=$withval
-else case e in #(
-  e)
+else
+
   PHP_LIBXML=yes
   test "$PHP_ENABLE_ALL" && PHP_LIBXML=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -22938,8 +19763,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -22951,17 +19776,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
-printf %s "checking for libxml-2.0 >= 2.9.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
+$as_echo_n "checking for libxml-2.0 >= 2.9.0... " >&6; }
 
 if test -n "$LIBXML_CFLAGS"; then
     pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -22975,10 +19800,10 @@
     pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -22992,8 +19817,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -23019,10 +19844,10 @@
 and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -23032,12 +19857,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
 	LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -23182,12 +20007,12 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
 
 
 
-printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
 
   ext_builddir=ext/libxml
@@ -23323,7 +20148,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_LIBXML 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_LIBXML 1
+_ACEOF
 
     fi
   fi
@@ -23472,19 +20299,17 @@
 
 php_with_openssl=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenSSL support" >&5
-printf %s "checking for OpenSSL support... " >&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+y}
-then :
+if test "${with_openssl+set}" = set; then :
   withval=$with_openssl; PHP_OPENSSL=$withval
-else case e in #(
-  e)
+else
+
   PHP_OPENSSL=no
   test "$PHP_ENABLE_ALL" && PHP_OPENSSL=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -23510,8 +20335,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -23519,25 +20344,23 @@
 
 php_with_kerberos=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Kerberos support" >&5
-printf %s "checking for Kerberos support... " >&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+y}
-then :
+if test "${with_kerberos+set}" = set; then :
   withval=$with_kerberos; PHP_KERBEROS=$withval
-else case e in #(
-  e)
+else
+
   PHP_KERBEROS=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_KERBEROS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -23545,25 +20368,23 @@
 
 php_with_system_ciphers=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use system default cipher list instead of hardcoded value" >&5
-printf %s "checking whether to use system default cipher list instead of hardcoded value... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use system default cipher list instead of hardcoded value" >&5
+$as_echo_n "checking whether to use system default cipher list instead of hardcoded value... " >&6; }
 
 # Check whether --with-system-ciphers was given.
-if test ${with_system_ciphers+y}
-then :
+if test "${with_system_ciphers+set}" = set; then :
   withval=$with_system_ciphers; PHP_SYSTEM_CIPHERS=$withval
-else case e in #(
-  e)
+else
+
   PHP_SYSTEM_CIPHERS=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_SYSTEM_CIPHERS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -23703,7 +20524,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_OPENSSL 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_OPENSSL 1
+_ACEOF
 
     fi
   fi
@@ -23831,17 +20654,17 @@
   if test "$PHP_KERBEROS" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for krb5-gssapi krb5" >&5
-printf %s "checking for krb5-gssapi krb5... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5-gssapi krb5" >&5
+$as_echo_n "checking for krb5-gssapi krb5... " >&6; }
 
 if test -n "$KERBEROS_CFLAGS"; then
     pkg_cv_KERBEROS_CFLAGS="$KERBEROS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
   ($PKG_CONFIG --exists --print-errors "krb5-gssapi krb5") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_KERBEROS_CFLAGS=`$PKG_CONFIG --cflags "krb5-gssapi krb5" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -23855,10 +20678,10 @@
     pkg_cv_KERBEROS_LIBS="$KERBEROS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
   ($PKG_CONFIG --exists --print-errors "krb5-gssapi krb5") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_KERBEROS_LIBS=`$PKG_CONFIG --libs "krb5-gssapi krb5" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -23872,8 +20695,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -23899,10 +20722,10 @@
 and KERBEROS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -23912,12 +20735,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	KERBEROS_CFLAGS=$pkg_cv_KERBEROS_CFLAGS
 	KERBEROS_LIBS=$pkg_cv_KERBEROS_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -24067,17 +20890,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
-printf %s "checking for openssl >= 1.0.2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
+$as_echo_n "checking for openssl >= 1.0.2... " >&6; }
 
 if test -n "$OPENSSL_CFLAGS"; then
     pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -24091,10 +20914,10 @@
     pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -24108,8 +20931,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -24135,10 +20958,10 @@
 and OPENSSL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -24148,12 +20971,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
 	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	found_openssl=yes
 fi
 
@@ -24299,7 +21122,7 @@
 
 
 
-printf "%s\n" "#define HAVE_OPENSSL_EXT 1" >>confdefs.h
+$as_echo "#define HAVE_OPENSSL_EXT 1" >>confdefs.h
 
 
 else
@@ -24308,17 +21131,21 @@
   fi
 
 
+  for ac_func in RAND_egd
+do :
   ac_fn_c_check_func "$LINENO" "RAND_egd" "ac_cv_func_RAND_egd"
-if test "x$ac_cv_func_RAND_egd" = xyes
-then :
-  printf "%s\n" "#define HAVE_RAND_EGD 1" >>confdefs.h
+if test "x$ac_cv_func_RAND_egd" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_RAND_EGD 1
+_ACEOF
 
 fi
+done
 
 
   if test "$PHP_SYSTEM_CIPHERS" != "no"; then
 
-printf "%s\n" "#define USE_OPENSSL_SYSTEM_CIPHERS 1" >>confdefs.h
+$as_echo "#define USE_OPENSSL_SYSTEM_CIPHERS 1" >>confdefs.h
 
   fi
 fi
@@ -24332,15 +21159,13 @@
 
 
 # Check whether --with-external-pcre was given.
-if test ${with_external_pcre+y}
-then :
+if test "${with_external_pcre+set}" = set; then :
   withval=$with_external_pcre; PHP_EXTERNAL_PCRE=$withval
-else case e in #(
-  e)
+else
+
   PHP_EXTERNAL_PCRE=no
 
- ;;
-esac
+
 fi
 
 
@@ -24356,15 +21181,13 @@
 
 
 # Check whether --with-pcre-jit was given.
-if test ${with_pcre_jit+y}
-then :
+if test "${with_pcre_jit+set}" = set; then :
   withval=$with_pcre_jit; PHP_PCRE_JIT=$withval
-else case e in #(
-  e)
+else
+
   PHP_PCRE_JIT=yes
 
- ;;
-esac
+
 fi
 
 
@@ -24378,17 +21201,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpcre2-8 >= 10.30" >&5
-printf %s "checking for libpcre2-8 >= 10.30... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpcre2-8 >= 10.30" >&5
+$as_echo_n "checking for libpcre2-8 >= 10.30... " >&6; }
 
 if test -n "$PCRE2_CFLAGS"; then
     pkg_cv_PCRE2_CFLAGS="$PCRE2_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-8 >= 10.30\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-8 >= 10.30\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libpcre2-8 >= 10.30") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PCRE2_CFLAGS=`$PKG_CONFIG --cflags "libpcre2-8 >= 10.30" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -24402,10 +21225,10 @@
     pkg_cv_PCRE2_LIBS="$PCRE2_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-8 >= 10.30\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre2-8 >= 10.30\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libpcre2-8 >= 10.30") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PCRE2_LIBS=`$PKG_CONFIG --libs "libpcre2-8 >= 10.30" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -24419,8 +21242,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -24446,10 +21269,10 @@
 and PCRE2_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -24459,12 +21282,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	PCRE2_CFLAGS=$pkg_cv_PCRE2_CFLAGS
 	PCRE2_LIBS=$pkg_cv_PCRE2_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -24590,19 +21413,17 @@
   done
 
 
-printf "%s\n" "#define PCRE2_CODE_UNIT_WIDTH 8" >>confdefs.h
+$as_echo "#define PCRE2_CODE_UNIT_WIDTH 8" >>confdefs.h
 
 
   if test "$PHP_PCRE_JIT" != "no"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for JIT support in PCRE2" >&5
-printf %s "checking for JIT support in PCRE2... " >&6; }
-if test ${ac_cv_have_pcre2_jit+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-      if test "$cross_compiling" = yes
-then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JIT support in PCRE2" >&5
+$as_echo_n "checking for JIT support in PCRE2... " >&6; }
+if ${ac_cv_have_pcre2_jit+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+      if test "$cross_compiling" = yes; then :
 
 
           case $host_cpu in
@@ -24614,8 +21435,8 @@
             ;;
           esac
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -24628,29 +21449,25 @@
               }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
           ac_cv_have_pcre2_jit=yes
 
-else case e in #(
-  e)
+else
+
           ac_cv_have_pcre2_jit=no
-         ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
-       ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_pcre2_jit" >&5
-printf "%s\n" "$ac_cv_have_pcre2_jit" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_pcre2_jit" >&5
+$as_echo "$ac_cv_have_pcre2_jit" >&6; }
       if test $ac_cv_have_pcre2_jit = yes; then
-        printf "%s\n" "#define HAVE_PCRE_JIT_SUPPORT 1" >>confdefs.h
+        $as_echo "#define HAVE_PCRE_JIT_SUPPORT 1" >>confdefs.h
 
       fi
   fi
@@ -24789,7 +21606,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PCRE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PCRE 1
+_ACEOF
 
     fi
   fi
@@ -24931,10 +21750,10 @@
 
 
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PCRE library to use" >&5
-printf %s "checking for PCRE library to use... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: bundled" >&5
-printf "%s\n" "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="pcre2lib/pcre2_auto_possess.c pcre2lib/pcre2_chartables.c pcre2lib/pcre2_compile.c \
       pcre2lib/pcre2_config.c pcre2lib/pcre2_context.c pcre2lib/pcre2_dfa_match.c pcre2lib/pcre2_error.c \
   pcre2lib/pcre2_jit_compile.c pcre2lib/pcre2_maketables.c pcre2lib/pcre2_match.c pcre2lib/pcre2_match_data.c \
@@ -24943,72 +21762,65 @@
   pcre2lib/pcre2_tables.c pcre2lib/pcre2_ucd.c pcre2lib/pcre2_valid_utf.c pcre2lib/pcre2_xclass.c \
   pcre2lib/pcre2_find_bracket.c pcre2lib/pcre2_convert.c pcre2lib/pcre2_extuni.c pcre2lib/pcre2_script_run.c"
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-implicit-fallthrough" >&5
-printf %s "checking whether C compiler accepts -Wno-implicit-fallthrough... " >&6; }
-if test ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-implicit-fallthrough" >&5
+$as_echo_n "checking whether C compiler accepts -Wno-implicit-fallthrough... " >&6; }
+if ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wno-implicit-fallthrough"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5
+$as_echo "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes; then :
   PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -Wno-implicit-fallthrough"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
 
   PHP_PCRE_CFLAGS="$PHP_PCRE_CFLAGS -DHAVE_CONFIG_H -I@ext_srcdir@/pcre2lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1"
 
-printf "%s\n" "#define HAVE_BUNDLED_PCRE 1" >>confdefs.h
+$as_echo "#define HAVE_BUNDLED_PCRE 1" >>confdefs.h
 
 
-printf "%s\n" "#define PCRE2_CODE_UNIT_WIDTH 8" >>confdefs.h
+$as_echo "#define PCRE2_CODE_UNIT_WIDTH 8" >>confdefs.h
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable PCRE JIT functionality" >&5
-printf %s "checking whether to enable PCRE JIT functionality... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable PCRE JIT functionality" >&5
+$as_echo_n "checking whether to enable PCRE JIT functionality... " >&6; }
   if test "$PHP_PCRE_JIT" != "no"; then
 
-printf "%s\n" "#define HAVE_PCRE_JIT_SUPPORT 1" >>confdefs.h
+$as_echo "#define HAVE_PCRE_JIT_SUPPORT 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Intel CET is enabled" >&5
+$as_echo_n "checking whether Intel CET is enabled... " >&6; }
+if ${ac_cv_have_pcre2_intel_cet+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether Intel CET is enabled" >&5
-printf %s "checking whether Intel CET is enabled... " >&6; }
-if test ${ac_cv_have_pcre2_intel_cet+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -25018,30 +21830,27 @@
           #endif
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
           ac_cv_have_pcre2_intel_cet=yes
 
-else case e in #(
-  e)
+else
+
           ac_cv_have_pcre2_intel_cet=no
-         ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
       if test "$ac_cv_have_pcre2_intel_cet" = yes; then
         PHP_PCRE_CFLAGS="-mshstk $PHP_PCRE_CFLAGS"
       fi
-     ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_pcre2_intel_cet" >&5
-printf "%s\n" "$ac_cv_have_pcre2_intel_cet" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_pcre2_intel_cet" >&5
+$as_echo "$ac_cv_have_pcre2_intel_cet" >&6; }
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
@@ -25178,7 +21987,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PCRE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PCRE 1
+_ACEOF
 
     fi
   fi
@@ -25328,7 +22139,7 @@
   if test "$PHP_VALGRIND" != "no" && test "$have_valgrind" = "yes"; then
             if test "$ZEND_DEBUG" = "yes"; then
 
-printf "%s\n" "#define HAVE_PCRE_VALGRIND_SUPPORT 1" >>confdefs.h
+$as_echo "#define HAVE_PCRE_VALGRIND_SUPPORT 1" >>confdefs.h
 
       fi
   fi
@@ -25340,19 +22151,17 @@
 
 php_with_sqlite3=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable the SQLite3 extension" >&5
-printf %s "checking whether to enable the SQLite3 extension... " >&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+y}
-then :
+if test "${with_sqlite3+set}" = set; then :
   withval=$with_sqlite3; PHP_SQLITE3=$withval
-else case e in #(
-  e)
+else
+
   PHP_SQLITE3=yes
   test "$PHP_ENABLE_ALL" && PHP_SQLITE3=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -25378,8 +22187,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -25387,17 +22196,17 @@
 if test $PHP_SQLITE3 != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3 >= 3.7.7" >&5
-printf %s "checking for sqlite3 >= 3.7.7... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3 >= 3.7.7" >&5
+$as_echo_n "checking for sqlite3 >= 3.7.7... " >&6; }
 
 if test -n "$SQLITE_CFLAGS"; then
     pkg_cv_SQLITE_CFLAGS="$SQLITE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
   ($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.7.7") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= 3.7.7" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -25411,10 +22220,10 @@
     pkg_cv_SQLITE_LIBS="$SQLITE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
   ($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.7.7") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SQLITE_LIBS=`$PKG_CONFIG --libs "sqlite3 >= 3.7.7" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -25428,8 +22237,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -25455,10 +22264,10 @@
 and SQLITE_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -25468,12 +22277,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	SQLITE_CFLAGS=$pkg_cv_SQLITE_CFLAGS
 	SQLITE_LIBS=$pkg_cv_SQLITE_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -25617,7 +22426,7 @@
   done
 
 
-printf "%s\n" "#define HAVE_SQLITE3 1" >>confdefs.h
+$as_echo "#define HAVE_SQLITE3 1" >>confdefs.h
 
 
 
@@ -25725,68 +22534,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_errstr in -lsqlite3" >&5
-printf %s "checking for sqlite3_errstr in -lsqlite3... " >&6; }
-if test ${ac_cv_lib_sqlite3_sqlite3_errstr+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_errstr in -lsqlite3" >&5
+$as_echo_n "checking for sqlite3_errstr in -lsqlite3... " >&6; }
+if ${ac_cv_lib_sqlite3_sqlite3_errstr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char sqlite3_errstr (void);
+char sqlite3_errstr ();
 int
-main (void)
+main ()
 {
 return sqlite3_errstr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sqlite3_sqlite3_errstr=yes
-else case e in #(
-  e) ac_cv_lib_sqlite3_sqlite3_errstr=no ;;
-esac
+else
+  ac_cv_lib_sqlite3_sqlite3_errstr=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_errstr" >&5
-printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_errstr" >&6; }
-if test "x$ac_cv_lib_sqlite3_sqlite3_errstr" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_errstr" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_errstr" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_errstr" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_SQLITE3_ERRSTR 1" >>confdefs.h
+$as_echo "#define HAVE_SQLITE3_ERRSTR 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sqlite3_sqlite3_errstr
 
-   ;;
-esac
+
 fi
 
 
@@ -25895,68 +22695,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_expanded_sql in -lsqlite3" >&5
-printf %s "checking for sqlite3_expanded_sql in -lsqlite3... " >&6; }
-if test ${ac_cv_lib_sqlite3_sqlite3_expanded_sql+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_expanded_sql in -lsqlite3" >&5
+$as_echo_n "checking for sqlite3_expanded_sql in -lsqlite3... " >&6; }
+if ${ac_cv_lib_sqlite3_sqlite3_expanded_sql+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char sqlite3_expanded_sql (void);
+char sqlite3_expanded_sql ();
 int
-main (void)
+main ()
 {
 return sqlite3_expanded_sql ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sqlite3_sqlite3_expanded_sql=yes
-else case e in #(
-  e) ac_cv_lib_sqlite3_sqlite3_expanded_sql=no ;;
-esac
+else
+  ac_cv_lib_sqlite3_sqlite3_expanded_sql=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_expanded_sql" >&5
-printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_expanded_sql" >&6; }
-if test "x$ac_cv_lib_sqlite3_sqlite3_expanded_sql" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_expanded_sql" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_expanded_sql" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_expanded_sql" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_SQLITE3_EXPANDED_SQL 1" >>confdefs.h
+$as_echo "#define HAVE_SQLITE3_EXPANDED_SQL 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sqlite3_sqlite3_expanded_sql
 
-   ;;
-esac
+
 fi
 
 
@@ -26066,66 +22857,57 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_load_extension in -lsqlite3" >&5
-printf %s "checking for sqlite3_load_extension in -lsqlite3... " >&6; }
-if test ${ac_cv_lib_sqlite3_sqlite3_load_extension+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_sqlite3_sqlite3_load_extension+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char sqlite3_load_extension (void);
+char sqlite3_load_extension ();
 int
-main (void)
+main ()
 {
 return sqlite3_load_extension ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sqlite3_sqlite3_load_extension=yes
-else case e in #(
-  e) ac_cv_lib_sqlite3_sqlite3_load_extension=no ;;
-esac
+else
+  ac_cv_lib_sqlite3_sqlite3_load_extension=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_load_extension" >&5
-printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_load_extension" >&6; }
-if test "x$ac_cv_lib_sqlite3_sqlite3_load_extension" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sqlite3_sqlite3_load_extension
 
-printf "%s\n" "#define SQLITE_OMIT_LOAD_EXTENSION 1" >>confdefs.h
+$as_echo "#define SQLITE_OMIT_LOAD_EXTENSION 1" >>confdefs.h
+
 
-   ;;
-esac
 fi
 
 
@@ -26263,7 +23045,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SQLITE3 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SQLITE3 1
+_ACEOF
 
     fi
   fi
@@ -26395,19 +23179,17 @@
 
 php_with_zlib=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ZLIB support" >&5
-printf %s "checking for ZLIB support... " >&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+y}
-then :
+if test "${with_zlib+set}" = set; then :
   withval=$with_zlib; PHP_ZLIB=$withval
-else case e in #(
-  e)
+else
+
   PHP_ZLIB=no
   test "$PHP_ENABLE_ALL" && PHP_ZLIB=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -26433,8 +23215,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -26442,17 +23224,17 @@
 if test "$PHP_ZLIB" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zlib >= 1.2.0.4" >&5
-printf %s "checking for zlib >= 1.2.0.4... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib >= 1.2.0.4" >&5
+$as_echo_n "checking for zlib >= 1.2.0.4... " >&6; }
 
 if test -n "$ZLIB_CFLAGS"; then
     pkg_cv_ZLIB_CFLAGS="$ZLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.0.4\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.0.4\""; } >&5
   ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.0.4") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ZLIB_CFLAGS=`$PKG_CONFIG --cflags "zlib >= 1.2.0.4" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -26466,10 +23248,10 @@
     pkg_cv_ZLIB_LIBS="$ZLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.0.4\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib >= 1.2.0.4\""; } >&5
   ($PKG_CONFIG --exists --print-errors "zlib >= 1.2.0.4") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ZLIB_LIBS=`$PKG_CONFIG --libs "zlib >= 1.2.0.4" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -26483,8 +23265,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -26510,10 +23292,10 @@
 and ZLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -26523,12 +23305,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS
 	ZLIB_LIBS=$pkg_cv_ZLIB_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -26673,7 +23455,7 @@
 
 
 
-printf "%s\n" "#define HAVE_ZLIB 1" >>confdefs.h
+$as_echo "#define HAVE_ZLIB 1" >>confdefs.h
 
 
 
@@ -26810,7 +23592,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_ZLIB 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_ZLIB 1
+_ACEOF
 
     fi
   fi
@@ -26942,18 +23726,16 @@
 
 php_enable_bcmath=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable bc style precision math functions" >&5
-printf %s "checking whether to enable bc style precision math functions... " >&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+y}
-then :
+if test "${enable_bcmath+set}" = set; then :
   enableval=$enable_bcmath; PHP_BCMATH=$enableval
-else case e in #(
-  e)
+else
+
   PHP_BCMATH=no
   test "$PHP_ENABLE_ALL" && PHP_BCMATH=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -26979,8 +23761,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -27128,7 +23910,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_BCMATH 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_BCMATH 1
+_ACEOF
 
     fi
   fi
@@ -27263,7 +24047,7 @@
 
 
 
-printf "%s\n" "#define HAVE_BCMATH 1" >>confdefs.h
+$as_echo "#define HAVE_BCMATH 1" >>confdefs.h
 
 fi
 
@@ -27273,19 +24057,17 @@
 
 php_with_bz2=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BZip2 support" >&5
-printf %s "checking for BZip2 support... " >&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+y}
-then :
+if test "${with_bz2+set}" = set; then :
   withval=$with_bz2; PHP_BZ2=$withval
-else case e in #(
-  e)
+else
+
   PHP_BZ2=no
   test "$PHP_ENABLE_ALL" && PHP_BZ2=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -27311,8 +24093,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -27321,21 +24103,21 @@
   if test -r $PHP_BZ2/include/bzlib.h; then
     BZIP_DIR=$PHP_BZ2
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BZip2 in default path" >&5
-printf %s "checking for BZip2 in default path... " >&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
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found in $i" >&5
-printf "%s\n" "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
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-printf "%s\n" "not found" >&6; }
+    { $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
 
@@ -27446,51 +24228,43 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzerror in -lbz2" >&5
-printf %s "checking for BZ2_bzerror in -lbz2... " >&6; }
-if test ${ac_cv_lib_bz2_BZ2_bzerror+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_bz2_BZ2_bzerror+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbz2  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char BZ2_bzerror (void);
+char BZ2_bzerror ();
 int
-main (void)
+main ()
 {
 return BZ2_bzerror ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bz2_BZ2_bzerror=yes
-else case e in #(
-  e) ac_cv_lib_bz2_BZ2_bzerror=no ;;
-esac
+else
+  ac_cv_lib_bz2_BZ2_bzerror=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzerror" >&5
-printf "%s\n" "$ac_cv_lib_bz2_BZ2_bzerror" >&6; }
-if test "x$ac_cv_lib_bz2_BZ2_bzerror" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -27624,20 +24398,19 @@
 
 
 
-printf "%s\n" "#define HAVE_BZ2 1" >>confdefs.h
+$as_echo "#define HAVE_BZ2 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_bz2_BZ2_bzerror
 
     as_fn_error $? "bz2 module requires libbz2 >= 1.0.0" "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
 
@@ -27775,7 +24548,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_BZ2 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_BZ2 1
+_ACEOF
 
     fi
   fi
@@ -27907,18 +24682,16 @@
 
 php_enable_calendar=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable calendar conversion support" >&5
-printf %s "checking whether to enable calendar conversion support... " >&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+y}
-then :
+if test "${enable_calendar+set}" = set; then :
   enableval=$enable_calendar; PHP_CALENDAR=$enableval
-else case e in #(
-  e)
+else
+
   PHP_CALENDAR=no
   test "$PHP_ENABLE_ALL" && PHP_CALENDAR=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -27944,15 +24717,15 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_CALENDAR 1" >>confdefs.h
+$as_echo "#define HAVE_CALENDAR 1" >>confdefs.h
 
 
   ext_builddir=ext/calendar
@@ -28088,7 +24861,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_CALENDAR 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_CALENDAR 1
+_ACEOF
 
     fi
   fi
@@ -28217,18 +24992,16 @@
 
 php_enable_ctype=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable ctype functions" >&5
-printf %s "checking whether to enable ctype functions... " >&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+y}
-then :
+if test "${enable_ctype+set}" = set; then :
   enableval=$enable_ctype; PHP_CTYPE=$enableval
-else case e in #(
-  e)
+else
+
   PHP_CTYPE=yes
   test "$PHP_ENABLE_ALL" && PHP_CTYPE=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -28254,15 +25027,15 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_CTYPE 1" >>confdefs.h
+$as_echo "#define HAVE_CTYPE 1" >>confdefs.h
 
 
   ext_builddir=ext/ctype
@@ -28398,7 +25171,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_CTYPE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_CTYPE 1
+_ACEOF
 
     fi
   fi
@@ -28527,19 +25302,17 @@
 
 php_with_curl=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cURL support" >&5
-printf %s "checking for cURL support... " >&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+y}
-then :
+if test "${with_curl+set}" = set; then :
   withval=$with_curl; PHP_CURL=$withval
-else case e in #(
-  e)
+else
+
   PHP_CURL=no
   test "$PHP_ENABLE_ALL" && PHP_CURL=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -28565,8 +25338,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -28574,17 +25347,17 @@
 if test "$PHP_CURL" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcurl >= 7.29.0" >&5
-printf %s "checking for libcurl >= 7.29.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl >= 7.29.0" >&5
+$as_echo_n "checking for libcurl >= 7.29.0... " >&6; }
 
 if test -n "$CURL_CFLAGS"; then
     pkg_cv_CURL_CFLAGS="$CURL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.29.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.29.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libcurl >= 7.29.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= 7.29.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -28598,10 +25371,10 @@
     pkg_cv_CURL_LIBS="$CURL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.29.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.29.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libcurl >= 7.29.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CURL_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.29.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -28615,8 +25388,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -28642,10 +25415,10 @@
 and CURL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -28655,12 +25428,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	CURL_CFLAGS=$pkg_cv_CURL_CFLAGS
 	CURL_LIBS=$pkg_cv_CURL_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -28668,10 +25441,10 @@
     pkg_cv_CURL_FEATURES="$CURL_FEATURES"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libcurl") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CURL_FEATURES=`$PKG_CONFIG --variable="supported_features" "libcurl" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -28683,8 +25456,7 @@
 fi
 CURL_FEATURES=$pkg_cv_CURL_FEATURES
 
-if test "x$CURL_FEATURES" = x""
-then :
+if test "x$CURL_FEATURES" = x""; then :
 
 fi
 
@@ -28828,18 +25600,18 @@
   done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SSL support in libcurl" >&5
-printf %s "checking for SSL support in libcurl... " >&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; }
   case "$CURL_FEATURES" in
     *SSL*)
       CURL_SSL=yes
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       ;;
     *)
       CURL_SSL=no
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       ;;
   esac
 
@@ -28847,16 +25619,15 @@
     save_LDFLAGS="$LDFLAGS"
     LDFLAGS="$LDFLAGS $CURL_LIBS"
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcurl linked against old openssl" >&5
-printf %s "checking for libcurl linked against old openssl... " >&6; }
-    if test "$cross_compiling" = yes
-then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libcurl linked against old openssl" >&5
+$as_echo_n "checking for libcurl linked against old openssl... " >&6; }
+    if test "$cross_compiling" = yes; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <strings.h>
@@ -28886,27 +25657,26 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_CURL_OLD_OPENSSL 1" >>confdefs.h
+$as_echo "#define HAVE_CURL_OLD_OPENSSL 1" >>confdefs.h
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5
-printf %s "checking for openssl... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl" >&5
+$as_echo_n "checking for openssl... " >&6; }
 
 if test -n "$OPENSSL_CFLAGS"; then
     pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -28920,10 +25690,10 @@
     pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -28937,8 +25707,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -28964,10 +25734,10 @@
 and OPENSSL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -28977,12 +25747,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
 	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 
   for ac_i in $OPENSSL_LIBS; do
@@ -29123,33 +25893,36 @@
     esac
   done
 
-        ac_fn_c_check_header_compile "$LINENO" "openssl/crypto.h" "ac_cv_header_openssl_crypto_h" "$ac_includes_default"
-if test "x$ac_cv_header_openssl_crypto_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_OPENSSL_CRYPTO_H 1" >>confdefs.h
+        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" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_OPENSSL_CRYPTO_H 1
+_ACEOF
 
 fi
 
+done
+
 
 fi
 
-else case e in #(
-  e)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-     ;;
-esac
+else
+
+      { $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.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
     LDFLAGS="$save_LDFLAGS"
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
@@ -29259,70 +26032,61 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for curl_easy_perform in -lcurl" >&5
-printf %s "checking for curl_easy_perform in -lcurl... " >&6; }
-if test ${ac_cv_lib_curl_curl_easy_perform+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_curl_curl_easy_perform+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcurl  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char curl_easy_perform (void);
+char curl_easy_perform ();
 int
-main (void)
+main ()
 {
 return curl_easy_perform ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_curl_curl_easy_perform=yes
-else case e in #(
-  e) ac_cv_lib_curl_curl_easy_perform=no ;;
-esac
+else
+  ac_cv_lib_curl_curl_easy_perform=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_easy_perform" >&5
-printf "%s\n" "$ac_cv_lib_curl_curl_easy_perform" >&6; }
-if test "x$ac_cv_lib_curl_curl_easy_perform" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_CURL 1" >>confdefs.h
+$as_echo "#define HAVE_CURL 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_curl_curl_easy_perform
 
     as_fn_error $? "There is something wrong. Please check config.log for more information." "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
 
@@ -29460,7 +26224,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_CURL 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_CURL 1
+_ACEOF
 
     fi
   fi
@@ -29627,15 +26393,13 @@
 
 
 # Check whether --enable-dba was given.
-if test ${enable_dba+y}
-then :
+if test "${enable_dba+set}" = set; then :
   enableval=$enable_dba; PHP_DBA=$enableval
-else case e in #(
-  e)
+else
+
   PHP_DBA=no
   test "$PHP_ENABLE_ALL" && PHP_DBA=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -29672,15 +26436,13 @@
 
 
 # Check whether --with-qdbm was given.
-if test ${with_qdbm+y}
-then :
+if test "${with_qdbm+set}" = set; then :
   withval=$with_qdbm; PHP_QDBM=$withval
-else case e in #(
-  e)
+else
+
   PHP_QDBM=no
 
- ;;
-esac
+
 fi
 
 
@@ -29696,15 +26458,13 @@
 
 
 # Check whether --with-gdbm was given.
-if test ${with_gdbm+y}
-then :
+if test "${with_gdbm+set}" = set; then :
   withval=$with_gdbm; PHP_GDBM=$withval
-else case e in #(
-  e)
+else
+
   PHP_GDBM=no
 
- ;;
-esac
+
 fi
 
 
@@ -29720,15 +26480,13 @@
 
 
 # Check whether --with-ndbm was given.
-if test ${with_ndbm+y}
-then :
+if test "${with_ndbm+set}" = set; then :
   withval=$with_ndbm; PHP_NDBM=$withval
-else case e in #(
-  e)
+else
+
   PHP_NDBM=no
 
- ;;
-esac
+
 fi
 
 
@@ -29744,15 +26502,13 @@
 
 
 # Check whether --with-db4 was given.
-if test ${with_db4+y}
-then :
+if test "${with_db4+set}" = set; then :
   withval=$with_db4; PHP_DB4=$withval
-else case e in #(
-  e)
+else
+
   PHP_DB4=no
 
- ;;
-esac
+
 fi
 
 
@@ -29768,15 +26524,13 @@
 
 
 # Check whether --with-db3 was given.
-if test ${with_db3+y}
-then :
+if test "${with_db3+set}" = set; then :
   withval=$with_db3; PHP_DB3=$withval
-else case e in #(
-  e)
+else
+
   PHP_DB3=no
 
- ;;
-esac
+
 fi
 
 
@@ -29792,15 +26546,13 @@
 
 
 # Check whether --with-db2 was given.
-if test ${with_db2+y}
-then :
+if test "${with_db2+set}" = set; then :
   withval=$with_db2; PHP_DB2=$withval
-else case e in #(
-  e)
+else
+
   PHP_DB2=no
 
- ;;
-esac
+
 fi
 
 
@@ -29816,15 +26568,13 @@
 
 
 # Check whether --with-db1 was given.
-if test ${with_db1+y}
-then :
+if test "${with_db1+set}" = set; then :
   withval=$with_db1; PHP_DB1=$withval
-else case e in #(
-  e)
+else
+
   PHP_DB1=no
 
- ;;
-esac
+
 fi
 
 
@@ -29840,15 +26590,13 @@
 
 
 # Check whether --with-dbm was given.
-if test ${with_dbm+y}
-then :
+if test "${with_dbm+set}" = set; then :
   withval=$with_dbm; PHP_DBM=$withval
-else case e in #(
-  e)
+else
+
   PHP_DBM=no
 
- ;;
-esac
+
 fi
 
 
@@ -29864,15 +26612,13 @@
 
 
 # Check whether --with-tcadb was given.
-if test ${with_tcadb+y}
-then :
+if test "${with_tcadb+set}" = set; then :
   withval=$with_tcadb; PHP_TCADB=$withval
-else case e in #(
-  e)
+else
+
   PHP_TCADB=no
 
- ;;
-esac
+
 fi
 
 
@@ -29888,15 +26634,13 @@
 
 
 # Check whether --with-lmdb was given.
-if test ${with_lmdb+y}
-then :
+if test "${with_lmdb+set}" = set; then :
   withval=$with_lmdb; PHP_LMDB=$withval
-else case e in #(
-  e)
+else
+
   PHP_LMDB=no
 
- ;;
-esac
+
 fi
 
 
@@ -30030,74 +26774,67 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_dpopen" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dpopen in -l$LIB" >&5
-printf %s "checking for dpopen in -l$LIB... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  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 eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dpopen (void);
+char dpopen ();
 int
-main (void)
+main ()
 {
 return dpopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define QDBM_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define QDBM_INCLUDE_FILE "$THIS_INCLUDE"
+_ACEOF
 
 
-printf "%s\n" "#define DBA_QDBM 1" >>confdefs.h
+$as_echo "#define DBA_QDBM 1" >>confdefs.h
 
         THIS_LIBS=$LIB
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$LIB_dpopen
 
-   ;;
-esac
+
 fi
 
       if test -n "$THIS_LIBS"; then
@@ -30228,19 +26965,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&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
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -30257,19 +26994,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&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
     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
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -30388,72 +27125,65 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdbm_open in -lgdbm" >&5
-printf %s "checking for gdbm_open in -lgdbm... " >&6; }
-if test ${ac_cv_lib_gdbm_gdbm_open+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_gdbm_gdbm_open+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgdbm  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char gdbm_open (void);
+char gdbm_open ();
 int
-main (void)
+main ()
 {
 return gdbm_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gdbm_gdbm_open=yes
-else case e in #(
-  e) ac_cv_lib_gdbm_gdbm_open=no ;;
-esac
+else
+  ac_cv_lib_gdbm_gdbm_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdbm_gdbm_open" >&5
-printf "%s\n" "$ac_cv_lib_gdbm_gdbm_open" >&6; }
-if test "x$ac_cv_lib_gdbm_gdbm_open" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define GDBM_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define GDBM_INCLUDE_FILE "$THIS_INCLUDE"
+_ACEOF
 
 
-printf "%s\n" "#define DBA_GDBM 1" >>confdefs.h
+$as_echo "#define DBA_GDBM 1" >>confdefs.h
 
       THIS_LIBS=gdbm
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gdbm_gdbm_open
 
-   ;;
-esac
+
 fi
 
   fi
@@ -30580,19 +27310,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&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
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -30720,74 +27450,67 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_dbm_open" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dbm_open in -l$LIB" >&5
-printf %s "checking for dbm_open in -l$LIB... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  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 eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dbm_open (void);
+char dbm_open ();
 int
-main (void)
+main ()
 {
 return dbm_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define NDBM_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define NDBM_INCLUDE_FILE "$THIS_INCLUDE"
+_ACEOF
 
 
-printf "%s\n" "#define DBA_NDBM 1" >>confdefs.h
+$as_echo "#define DBA_NDBM 1" >>confdefs.h
 
         THIS_LIBS=$LIB
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$LIB_dbm_open
 
-   ;;
-esac
+
 fi
 
       if test -n "$THIS_LIBS"; then
@@ -30918,19 +27641,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&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
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -31085,74 +27808,67 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_tcadbopen" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tcadbopen in -l$LIB" >&5
-printf %s "checking for tcadbopen in -l$LIB... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  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 eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char tcadbopen (void);
+char tcadbopen ();
 int
-main (void)
+main ()
 {
 return tcadbopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define TCADB_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define TCADB_INCLUDE_FILE "$THIS_INCLUDE"
+_ACEOF
 
 
-printf "%s\n" "#define DBA_TCADB 1" >>confdefs.h
+$as_echo "#define DBA_TCADB 1" >>confdefs.h
 
 		THIS_LIBS=$LIB
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$LIB_tcadbopen
 
-   ;;
-esac
+
 fi
 
 	  if test -n "$THIS_LIBS"; then
@@ -31283,19 +27999,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&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
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -31450,74 +28166,67 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_mdb_env_open" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mdb_env_open in -l$LIB" >&5
-printf %s "checking for mdb_env_open in -l$LIB... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$LIB''_mdb_env_open" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mdb_env_open in -l$LIB" >&5
+$as_echo_n "checking for mdb_env_open in -l$LIB... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char mdb_env_open (void);
+char mdb_env_open ();
 int
-main (void)
+main ()
 {
 return mdb_env_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define LMDB_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define LMDB_INCLUDE_FILE "$THIS_INCLUDE"
+_ACEOF
 
 
-printf "%s\n" "#define DBA_LMDB 1" >>confdefs.h
+$as_echo "#define DBA_LMDB 1" >>confdefs.h
 
 		THIS_LIBS=$LIB
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$LIB_mdb_env_open
 
-   ;;
-esac
+
 fi
 
 	  if test -n "$THIS_LIBS"; then
@@ -31648,19 +28357,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&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
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -31747,7 +28456,7 @@
 #include "$THIS_INCLUDE"
 
 int
-main (void)
+main ()
 {
 
           (void)db_create((DB**)0, (DB_ENV*)0, 0);
@@ -31756,8 +28465,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -31769,18 +28477,17 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
-then :
+  $EGREP "yes" >/dev/null 2>&1; then :
 
             THIS_LIBS=$LIB
             lib_found=1
 
 fi
-rm -rf conftest*
+rm -f conftest*
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
   LDFLAGS=$old_LDFLAGS
@@ -31793,13 +28500,13 @@
     fi
   done
   if test -z "$THIS_LIBS"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB4 major version" >&5
-printf %s "checking for DB4 major version... " >&6; }
+    { $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
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5
-printf %s "checking for DB4 minor version and patch level... " >&6; }
+    { $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.  */
 
@@ -31810,24 +28517,22 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
-then :
+  $EGREP "yes" >/dev/null 2>&1; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+
+else
 
-else case e in #(
-  e)
       as_fn_error $? "Version 4.1 requires patch level 25" "$LINENO" 5
-     ;;
-esac
+
 fi
-rm -rf conftest*
+rm -f conftest*
 
   fi
   if test "$ext_shared" = "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5
-printf %s "checking if dba can be used as shared extension... " >&6; }
+    { $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.  */
 
@@ -31838,28 +28543,28 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
-then :
+  $EGREP "yes" >/dev/null 2>&1; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
       as_fn_error $? "At least version 3.3 is required" "$LINENO" 5
-     ;;
-esac
+
 fi
-rm -rf conftest*
+rm -f conftest*
 
   fi
   if test -n "$THIS_LIBS"; then
 
-printf "%s\n" "#define DBA_DB4 1" >>confdefs.h
+$as_echo "#define DBA_DB4 1" >>confdefs.h
 
     if test -n "$THIS_INCLUDE"; then
 
-printf "%s\n" "#define DB4_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define DB4_INCLUDE_FILE "$THIS_INCLUDE"
+_ACEOF
 
     fi
   else
@@ -31983,19 +28688,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&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
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -32012,19 +28717,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&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
     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
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -32071,7 +28776,7 @@
 #include "$THIS_INCLUDE"
 
 int
-main (void)
+main ()
 {
 
           (void)db_create((DB**)0, (DB_ENV*)0, 0);
@@ -32080,8 +28785,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -32093,18 +28797,17 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
-then :
+  $EGREP "yes" >/dev/null 2>&1; then :
 
             THIS_LIBS=$LIB
             lib_found=1
 
 fi
-rm -rf conftest*
+rm -f conftest*
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
   LDFLAGS=$old_LDFLAGS
@@ -32117,13 +28820,13 @@
     fi
   done
   if test -z "$THIS_LIBS"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB3 major version" >&5
-printf %s "checking for DB3 major version... " >&6; }
+    { $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
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5
-printf %s "checking for DB4 minor version and patch level... " >&6; }
+    { $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.  */
 
@@ -32134,24 +28837,22 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
-then :
+  $EGREP "yes" >/dev/null 2>&1; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+
+else
 
-else case e in #(
-  e)
       as_fn_error $? "Version 4.1 requires patch level 25" "$LINENO" 5
-     ;;
-esac
+
 fi
-rm -rf conftest*
+rm -f conftest*
 
   fi
   if test "$ext_shared" = "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5
-printf %s "checking if dba can be used as shared extension... " >&6; }
+    { $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.  */
 
@@ -32162,28 +28863,28 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
-then :
+  $EGREP "yes" >/dev/null 2>&1; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
       as_fn_error $? "At least version 3.3 is required" "$LINENO" 5
-     ;;
-esac
+
 fi
-rm -rf conftest*
+rm -f conftest*
 
   fi
   if test -n "$THIS_LIBS"; then
 
-printf "%s\n" "#define DBA_DB3 1" >>confdefs.h
+$as_echo "#define DBA_DB3 1" >>confdefs.h
 
     if test -n "$THIS_INCLUDE"; then
 
-printf "%s\n" "#define DB3_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define DB3_INCLUDE_FILE "$THIS_INCLUDE"
+_ACEOF
 
     fi
   else
@@ -32307,19 +29008,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&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
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -32336,19 +29037,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&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
     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
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -32395,7 +29096,7 @@
 #include "$THIS_INCLUDE"
 
 int
-main (void)
+main ()
 {
 
           (void)db_appinit("", NULL, (DB_ENV*)0, 0);
@@ -32404,8 +29105,7 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -32417,18 +29117,17 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
-then :
+  $EGREP "yes" >/dev/null 2>&1; then :
 
             THIS_LIBS=$LIB
             lib_found=1
 
 fi
-rm -rf conftest*
+rm -f conftest*
 
 
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
   LDFLAGS=$old_LDFLAGS
@@ -32441,13 +29140,13 @@
     fi
   done
   if test -z "$THIS_LIBS"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB2 major version" >&5
-printf %s "checking for DB2 major version... " >&6; }
+    { $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
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB4 minor version and patch level" >&5
-printf %s "checking for DB4 minor version and patch level... " >&6; }
+    { $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.  */
 
@@ -32458,24 +29157,22 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
-then :
+  $EGREP "yes" >/dev/null 2>&1; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
+
+else
 
-else case e in #(
-  e)
       as_fn_error $? "Version 4.1 requires patch level 25" "$LINENO" 5
-     ;;
-esac
+
 fi
-rm -rf conftest*
+rm -f conftest*
 
   fi
   if test "$ext_shared" = "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if dba can be used as shared extension" >&5
-printf %s "checking if dba can be used as shared extension... " >&6; }
+    { $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.  */
 
@@ -32486,28 +29183,28 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
-then :
+  $EGREP "yes" >/dev/null 2>&1; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
       as_fn_error $? "At least version 3.3 is required" "$LINENO" 5
-     ;;
-esac
+
 fi
-rm -rf conftest*
+rm -f conftest*
 
   fi
   if test -n "$THIS_LIBS"; then
 
-printf "%s\n" "#define DBA_DB2 1" >>confdefs.h
+$as_echo "#define DBA_DB2 1" >>confdefs.h
 
     if test -n "$THIS_INCLUDE"; then
 
-printf "%s\n" "#define DB2_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define DB2_INCLUDE_FILE "$THIS_INCLUDE"
+_ACEOF
 
     fi
   else
@@ -32631,19 +29328,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&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
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -32652,8 +29349,8 @@
 
   unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB1 in library" >&5
-printf %s "checking for DB1 in library... " >&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
@@ -32668,7 +29365,9 @@
   fi
   if test "$HAVE_DB4" = "1" || test "$HAVE_DB3" = "1" || test "$HAVE_DB2" = "1"; then
 
-printf "%s\n" "#define DB1_VERSION \"Berkeley DB 1.85 emulation in DB$THIS_VERSION\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define DB1_VERSION "Berkeley DB 1.85 emulation in DB$THIS_VERSION"
+_ACEOF
 
     for i in db$THIS_VERSION/db_185.h include/db$THIS_VERSION/db_185.h include/db/db_185.h; do
       if test -f "$THIS_PREFIX/$i"; then
@@ -32678,7 +29377,9 @@
     done
   else
 
-printf "%s\n" "#define DB1_VERSION \"Unknown DB1\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define DB1_VERSION "Unknown DB1"
+_ACEOF
 
     for i in $PHP_DB1 /usr/local /usr; do
       if test -f "$i/db1/db.h"; then
@@ -32697,12 +29398,12 @@
     done
     THIS_LIBS=db
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_LIBS" >&5
-printf "%s\n" "$THIS_LIBS" >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DB1 in header" >&5
-printf %s "checking for DB1 in header... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_INCLUDE" >&5
-printf "%s\n" "$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
@@ -32716,7 +29417,7 @@
 #include "$THIS_INCLUDE"
 
 int
-main (void)
+main ()
 {
 
         DB * dbp = dbopen("", 0, 0, DB_HASH, 0);
@@ -32725,24 +29426,24 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
 
-printf "%s\n" "#define DB1_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define DB1_INCLUDE_FILE "$THIS_INCLUDE"
+_ACEOF
 
 
-printf "%s\n" "#define DBA_DB1 1" >>confdefs.h
+$as_echo "#define DBA_DB1 1" >>confdefs.h
 
         THIS_RESULT=yes
 
-else case e in #(
-  e)
+else
+
         THIS_RESULT=no
-       ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
   LDFLAGS=$old_LDFLAGS
@@ -32871,19 +29572,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&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
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -32900,19 +29601,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&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
     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
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -33036,89 +29737,86 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_dbminit" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dbminit in -l$LIB" >&5
-printf %s "checking for dbminit in -l$LIB... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  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 eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dbminit (void);
+char dbminit ();
 int
-main (void)
+main ()
 {
 return dbminit ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DBM using GDBM" >&5
-printf %s "checking for DBM using GDBM... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBM using GDBM" >&5
+$as_echo_n "checking for DBM using GDBM... " >&6; }
 
-printf "%s\n" "#define DBM_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define DBM_INCLUDE_FILE "$THIS_INCLUDE"
+_ACEOF
 
         if test "$LIB" = "gdbm"; then
 
-printf "%s\n" "#define DBM_VERSION \"GDBM\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define DBM_VERSION "GDBM"
+_ACEOF
 
-          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
         else
 
-printf "%s\n" "#define DBM_VERSION \"DBM\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define DBM_VERSION "DBM"
+_ACEOF
 
-          { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         fi
 
-printf "%s\n" "#define DBA_DBM 1" >>confdefs.h
+$as_echo "#define DBA_DBM 1" >>confdefs.h
 
         THIS_LIBS=$LIB
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$LIB_dbminit
 
-   ;;
-esac
+
 fi
 
       if test -n "$THIS_LIBS"; then
@@ -33249,19 +29947,19 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&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
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
@@ -33278,15 +29976,13 @@
 
 
 # Check whether --with-cdb was given.
-if test ${with_cdb+y}
-then :
+if test "${with_cdb+set}" = set; then :
   withval=$with_cdb; PHP_CDB=$withval
-else case e in #(
-  e)
+else
+
   PHP_CDB=$php_dba_enable
 
- ;;
-esac
+
 fi
 
 
@@ -33301,15 +29997,13 @@
 
 
 # Check whether --enable-inifile was given.
-if test ${enable_inifile+y}
-then :
+if test "${enable_inifile+set}" = set; then :
   enableval=$enable_inifile; PHP_INIFILE=$enableval
-else case e in #(
-  e)
+else
+
   PHP_INIFILE=$php_dba_enable
 
- ;;
-esac
+
 fi
 
 
@@ -33324,15 +30018,13 @@
 
 
 # Check whether --enable-flatfile was given.
-if test ${enable_flatfile+y}
-then :
+if test "${enable_flatfile+set}" = set; then :
   enableval=$enable_flatfile; PHP_FLATFILE=$enableval
-else case e in #(
-  e)
+else
+
   PHP_FLATFILE=$php_dba_enable
 
- ;;
-esac
+
 fi
 
 
@@ -33344,13 +30036,13 @@
 
 if test "$PHP_CDB" = "yes"; then
 
-printf "%s\n" "#define DBA_CDB_BUILTIN 1" >>confdefs.h
+$as_echo "#define DBA_CDB_BUILTIN 1" >>confdefs.h
 
 
-printf "%s\n" "#define DBA_CDB_MAKE 1" >>confdefs.h
+$as_echo "#define DBA_CDB_MAKE 1" >>confdefs.h
 
 
-printf "%s\n" "#define DBA_CDB 1" >>confdefs.h
+$as_echo "#define DBA_CDB 1" >>confdefs.h
 
   cdb_sources="libcdb/cdb.c libcdb/cdb_make.c libcdb/uint32.c"
   THIS_RESULT="builtin"
@@ -33473,74 +30165,67 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$LIB""_cdb_read" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cdb_read in -l$LIB" >&5
-printf %s "checking for cdb_read in -l$LIB... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  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 eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$LIB  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char cdb_read (void);
+char cdb_read ();
 int
-main (void)
+main ()
 {
 return cdb_read ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define CDB_INCLUDE_FILE \"$THIS_INCLUDE\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define CDB_INCLUDE_FILE "$THIS_INCLUDE"
+_ACEOF
 
 
-printf "%s\n" "#define DBA_CDB 1" >>confdefs.h
+$as_echo "#define DBA_CDB 1" >>confdefs.h
 
         THIS_LIBS=$LIB
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$LIB_cdb_read
 
-   ;;
-esac
+
 fi
 
       if test -n "$THIS_LIBS"; then
@@ -33671,26 +30356,26 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&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
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
 
 if test "$PHP_INIFILE" != "no"; then
 
-printf "%s\n" "#define DBA_INIFILE 1" >>confdefs.h
+$as_echo "#define DBA_INIFILE 1" >>confdefs.h
 
   ini_sources="libinifile/inifile.c"
   THIS_RESULT="builtin"
@@ -33702,26 +30387,26 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&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
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
 
 if test "$PHP_FLATFILE" != "no"; then
 
-printf "%s\n" "#define DBA_FLATFILE 1" >>confdefs.h
+$as_echo "#define DBA_FLATFILE 1" >>confdefs.h
 
   flat_sources="libflatfile/flatfile.c"
   THIS_RESULT="builtin"
@@ -33733,35 +30418,35 @@
   else
     THIS_FULL_NAME="$THIS_NAME"
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $THIS_FULL_NAME support" >&5
-printf %s "checking for $THIS_FULL_NAME support... " >&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
     as_fn_error $? "" "$LINENO" 5
   fi
   if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
     HAVE_DBA=1
     eval HAVE_$THIS_NAME=1
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
-printf "%s\n" "$THIS_RESULT" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THIS_RESULT" >&5
+$as_echo "$THIS_RESULT" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
   unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable DBA interface" >&5
-printf %s "checking whether to enable DBA interface... " >&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
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes, shared" >&5
-printf "%s\n" "yes, shared" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, shared" >&5
+$as_echo "yes, shared" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   fi
 
-printf "%s\n" "#define HAVE_DBA 1" >>confdefs.h
+$as_echo "#define HAVE_DBA 1" >>confdefs.h
 
 
   ext_builddir=ext/dba
@@ -33897,7 +30582,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_DBA 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_DBA 1
+_ACEOF
 
     fi
   fi
@@ -34037,8 +30724,8 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST DBA_SHARED_LIBADD"
 
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -34047,18 +30734,16 @@
 
 php_enable_dl_test=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable dl-test extension" >&5
-printf %s "checking whether to enable dl-test extension... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dl-test extension" >&5
+$as_echo_n "checking whether to enable dl-test extension... " >&6; }
 # Check whether --enable-dl-test was given.
-if test ${enable_dl_test+y}
-then :
+if test "${enable_dl_test+set}" = set; then :
   enableval=$enable_dl_test; PHP_DL_TEST=$enableval
-else case e in #(
-  e)
+else
+
   PHP_DL_TEST=no
   test "$PHP_ENABLE_ALL" && PHP_DL_TEST=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -34084,8 +30769,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -34225,7 +30910,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_DL_TEST 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_DL_TEST 1
+_ACEOF
 
     fi
   fi
@@ -34354,18 +31041,16 @@
 
 php_enable_dom=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable DOM support" >&5
-printf %s "checking whether to enable DOM support... " >&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+y}
-then :
+if test "${enable_dom+set}" = set; then :
   enableval=$enable_dom; PHP_DOM=$enableval
-else case e in #(
-  e)
+else
+
   PHP_DOM=yes
   test "$PHP_ENABLE_ALL" && PHP_DOM=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -34391,8 +31076,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -34406,17 +31091,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
-printf %s "checking for libxml-2.0 >= 2.9.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
+$as_echo_n "checking for libxml-2.0 >= 2.9.0... " >&6; }
 
 if test -n "$LIBXML_CFLAGS"; then
     pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -34430,10 +31115,10 @@
     pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -34447,8 +31132,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -34474,10 +31159,10 @@
 and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -34487,12 +31172,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
 	LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -34637,12 +31322,12 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
 
 
 
-printf "%s\n" "#define HAVE_DOM 1" >>confdefs.h
+$as_echo "#define HAVE_DOM 1" >>confdefs.h
 
 
   ext_builddir=ext/dom
@@ -34796,7 +31481,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_DOM 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_DOM 1
+_ACEOF
 
     fi
   fi
@@ -34985,19 +31672,17 @@
 
 php_with_enchant=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with Enchant support" >&5
-printf %s "checking whether to build with Enchant support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with Enchant support" >&5
+$as_echo_n "checking whether to build with Enchant support... " >&6; }
 
 # Check whether --with-enchant was given.
-if test ${with_enchant+y}
-then :
+if test "${with_enchant+set}" = set; then :
   withval=$with_enchant; PHP_ENCHANT=$withval
-else case e in #(
-  e)
+else
+
   PHP_ENCHANT=no
   test "$PHP_ENABLE_ALL" && PHP_ENCHANT=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -35023,8 +31708,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -35032,17 +31717,17 @@
 if test "$PHP_ENCHANT" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for enchant-2" >&5
-printf %s "checking for enchant-2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for enchant-2" >&5
+$as_echo_n "checking for enchant-2... " >&6; }
 
 if test -n "$ENCHANT2_CFLAGS"; then
     pkg_cv_ENCHANT2_CFLAGS="$ENCHANT2_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "enchant-2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ENCHANT2_CFLAGS=`$PKG_CONFIG --cflags "enchant-2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -35056,10 +31741,10 @@
     pkg_cv_ENCHANT2_LIBS="$ENCHANT2_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant-2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "enchant-2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ENCHANT2_LIBS=`$PKG_CONFIG --libs "enchant-2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -35073,8 +31758,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -35091,14 +31776,14 @@
 
 	found_enchant_2=no
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	found_enchant_2=no
 else
 	ENCHANT2_CFLAGS=$pkg_cv_ENCHANT2_CFLAGS
 	ENCHANT2_LIBS=$pkg_cv_ENCHANT2_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	found_enchant_2=yes
 fi
 
@@ -35245,25 +31930,25 @@
 
 
 
-printf "%s\n" "#define HAVE_ENCHANT_GET_VERSION 1" >>confdefs.h
+$as_echo "#define HAVE_ENCHANT_GET_VERSION 1" >>confdefs.h
 
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libenchant-2 not found trying with old libenchant" >&5
-printf "%s\n" "$as_me: WARNING: libenchant-2 not found trying with old libenchant" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libenchant-2 not found trying with old libenchant" >&5
+$as_echo "$as_me: WARNING: libenchant-2 not found trying with old libenchant" >&2;}
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for enchant >= 1.4.2" >&5
-printf %s "checking for enchant >= 1.4.2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for enchant >= 1.4.2" >&5
+$as_echo_n "checking for enchant >= 1.4.2... " >&6; }
 
 if test -n "$ENCHANT_CFLAGS"; then
     pkg_cv_ENCHANT_CFLAGS="$ENCHANT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= 1.4.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= 1.4.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "enchant >= 1.4.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ENCHANT_CFLAGS=`$PKG_CONFIG --cflags "enchant >= 1.4.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -35277,10 +31962,10 @@
     pkg_cv_ENCHANT_LIBS="$ENCHANT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= 1.4.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"enchant >= 1.4.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "enchant >= 1.4.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ENCHANT_LIBS=`$PKG_CONFIG --libs "enchant >= 1.4.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -35294,8 +31979,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -35321,10 +32006,10 @@
 and ENCHANT_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -35334,12 +32019,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	ENCHANT_CFLAGS=$pkg_cv_ENCHANT_CFLAGS
 	ENCHANT_LIBS=$pkg_cv_ENCHANT_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -35590,68 +32275,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for enchant_get_version in -lenchant" >&5
-printf %s "checking for enchant_get_version in -lenchant... " >&6; }
-if test ${ac_cv_lib_enchant_enchant_get_version+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for enchant_get_version in -lenchant" >&5
+$as_echo_n "checking for enchant_get_version in -lenchant... " >&6; }
+if ${ac_cv_lib_enchant_enchant_get_version+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lenchant  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char enchant_get_version (void);
+char enchant_get_version ();
 int
-main (void)
+main ()
 {
 return enchant_get_version ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_enchant_enchant_get_version=yes
-else case e in #(
-  e) ac_cv_lib_enchant_enchant_get_version=no ;;
-esac
+else
+  ac_cv_lib_enchant_enchant_get_version=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_enchant_enchant_get_version" >&5
-printf "%s\n" "$ac_cv_lib_enchant_enchant_get_version" >&6; }
-if test "x$ac_cv_lib_enchant_enchant_get_version" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_enchant_enchant_get_version" >&5
+$as_echo "$ac_cv_lib_enchant_enchant_get_version" >&6; }
+if test "x$ac_cv_lib_enchant_enchant_get_version" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_ENCHANT_GET_VERSION 1" >>confdefs.h
+$as_echo "#define HAVE_ENCHANT_GET_VERSION 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_enchant_enchant_get_version
 
-   ;;
-esac
+
 fi
 
 
@@ -35762,74 +32438,65 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for enchant_broker_set_param in -lenchant" >&5
-printf %s "checking for enchant_broker_set_param in -lenchant... " >&6; }
-if test ${ac_cv_lib_enchant_enchant_broker_set_param+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_enchant_enchant_broker_set_param+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lenchant  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char enchant_broker_set_param (void);
+char enchant_broker_set_param ();
 int
-main (void)
+main ()
 {
 return enchant_broker_set_param ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_enchant_enchant_broker_set_param=yes
-else case e in #(
-  e) ac_cv_lib_enchant_enchant_broker_set_param=no ;;
-esac
+else
+  ac_cv_lib_enchant_enchant_broker_set_param=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_enchant_enchant_broker_set_param" >&5
-printf "%s\n" "$ac_cv_lib_enchant_enchant_broker_set_param" >&6; }
-if test "x$ac_cv_lib_enchant_enchant_broker_set_param" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_ENCHANT_BROKER_SET_PARAM 1" >>confdefs.h
+$as_echo "#define HAVE_ENCHANT_BROKER_SET_PARAM 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_enchant_enchant_broker_set_param
 
-   ;;
-esac
+
 fi
 
   fi
 
 
-printf "%s\n" "#define HAVE_ENCHANT 1" >>confdefs.h
+$as_echo "#define HAVE_ENCHANT 1" >>confdefs.h
 
 
 
@@ -35966,7 +32633,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_ENCHANT 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_ENCHANT 1
+_ACEOF
 
     fi
   fi
@@ -36098,18 +32767,16 @@
 
 php_enable_exif=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable EXIF (metadata from images) support" >&5
-printf %s "checking whether to enable EXIF (metadata from images) support... " >&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+y}
-then :
+if test "${enable_exif+set}" = set; then :
   enableval=$enable_exif; PHP_EXIF=$enableval
-else case e in #(
-  e)
+else
+
   PHP_EXIF=no
   test "$PHP_ENABLE_ALL" && PHP_EXIF=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -36135,15 +32802,15 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_EXIF 1" >>confdefs.h
+$as_echo "#define HAVE_EXIF 1" >>confdefs.h
 
 
   ext_builddir=ext/exif
@@ -36279,7 +32946,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_EXIF 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_EXIF 1
+_ACEOF
 
     fi
   fi
@@ -36408,19 +33077,17 @@
 
 php_with_ffi=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FFI support" >&5
-printf %s "checking for FFI support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFI support" >&5
+$as_echo_n "checking for FFI support... " >&6; }
 
 # Check whether --with-ffi was given.
-if test ${with_ffi+y}
-then :
+if test "${with_ffi+set}" = set; then :
   withval=$with_ffi; PHP_FFI=$withval
-else case e in #(
-  e)
+else
+
   PHP_FFI=no
   test "$PHP_ENABLE_ALL" && PHP_FFI=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -36446,8 +33113,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -36455,17 +33122,17 @@
 if test "$PHP_FFI" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libffi >= 3.0.11" >&5
-printf %s "checking for libffi >= 3.0.11... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libffi >= 3.0.11" >&5
+$as_echo_n "checking for libffi >= 3.0.11... " >&6; }
 
 if test -n "$FFI_CFLAGS"; then
     pkg_cv_FFI_CFLAGS="$FFI_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi >= 3.0.11\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi >= 3.0.11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libffi >= 3.0.11") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_FFI_CFLAGS=`$PKG_CONFIG --cflags "libffi >= 3.0.11" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -36479,10 +33146,10 @@
     pkg_cv_FFI_LIBS="$FFI_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi >= 3.0.11\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libffi >= 3.0.11\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libffi >= 3.0.11") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_FFI_LIBS=`$PKG_CONFIG --libs "libffi >= 3.0.11" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -36496,8 +33163,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -36523,10 +33190,10 @@
 and FFI_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -36536,12 +33203,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	FFI_CFLAGS=$pkg_cv_FFI_CFLAGS
 	FFI_LIBS=$pkg_cv_FFI_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -36686,31 +33353,31 @@
 
 
 
-printf "%s\n" "#define HAVE_FFI 1" >>confdefs.h
+$as_echo "#define HAVE_FFI 1" >>confdefs.h
 
 
   ac_fn_c_check_type "$LINENO" "long double" "ac_cv_type_long_double" "$ac_includes_default"
-if test "x$ac_cv_type_long_double" = xyes
-then :
+if test "x$ac_cv_type_long_double" = xyes; then :
 
-printf "%s\n" "#define HAVE_LONG_DOUBLE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LONG_DOUBLE 1
+_ACEOF
 
 
 fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fastcall calling convention" >&5
-printf %s "checking for fastcall calling convention... " >&6; }
-if test ${ac_cv_ffi_fastcall+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fastcall calling convention" >&5
+$as_echo_n "checking for fastcall calling convention... " >&6; }
+if ${ac_cv_ffi_fastcall+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ffi.h>
 int
-main (void)
+main ()
 {
 return FFI_FASTCALL
   ;
@@ -36718,38 +33385,34 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_ffi_fastcall=yes
-else case e in #(
-  e) ac_cv_ffi_fastcall=no ;;
-esac
+else
+  ac_cv_ffi_fastcall=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_fastcall" >&5
-printf "%s\n" "$ac_cv_ffi_fastcall" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_fastcall" >&5
+$as_echo "$ac_cv_ffi_fastcall" >&6; }
 
   if test "$ac_cv_ffi_fastcall" = yes; then
 
-printf "%s\n" "#define HAVE_FFI_FASTCALL 1" >>confdefs.h
+$as_echo "#define HAVE_FFI_FASTCALL 1" >>confdefs.h
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for thiscall calling convention" >&5
-printf %s "checking for thiscall calling convention... " >&6; }
-if test ${ac_cv_ffi_thiscall+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for thiscall calling convention" >&5
+$as_echo_n "checking for thiscall calling convention... " >&6; }
+if ${ac_cv_ffi_thiscall+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ffi.h>
 int
-main (void)
+main ()
 {
 return FFI_THISCALL
   ;
@@ -36757,38 +33420,34 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_ffi_thiscall=yes
-else case e in #(
-  e) ac_cv_ffi_thiscall=no ;;
-esac
+else
+  ac_cv_ffi_thiscall=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_thiscall" >&5
-printf "%s\n" "$ac_cv_ffi_thiscall" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_thiscall" >&5
+$as_echo "$ac_cv_ffi_thiscall" >&6; }
 
   if test "$ac_cv_ffi_thiscall" = yes; then
 
-printf "%s\n" "#define HAVE_FFI_THISCALL 1" >>confdefs.h
+$as_echo "#define HAVE_FFI_THISCALL 1" >>confdefs.h
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdcall calling convention" >&5
-printf %s "checking for stdcall calling convention... " >&6; }
-if test ${ac_cv_ffi_stdcall+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdcall calling convention" >&5
+$as_echo_n "checking for stdcall calling convention... " >&6; }
+if ${ac_cv_ffi_stdcall+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ffi.h>
 int
-main (void)
+main ()
 {
 return FFI_STDCALL
   ;
@@ -36796,38 +33455,34 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_ffi_stdcall=yes
-else case e in #(
-  e) ac_cv_ffi_stdcall=no ;;
-esac
+else
+  ac_cv_ffi_stdcall=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_stdcall" >&5
-printf "%s\n" "$ac_cv_ffi_stdcall" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_stdcall" >&5
+$as_echo "$ac_cv_ffi_stdcall" >&6; }
 
   if test "$ac_cv_ffi_stdcall" = yes; then
 
-printf "%s\n" "#define HAVE_FFI_STDCALL 1" >>confdefs.h
+$as_echo "#define HAVE_FFI_STDCALL 1" >>confdefs.h
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pascal calling convention" >&5
-printf %s "checking for pascal calling convention... " >&6; }
-if test ${ac_cv_ffi_pascal+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pascal calling convention" >&5
+$as_echo_n "checking for pascal calling convention... " >&6; }
+if ${ac_cv_ffi_pascal+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ffi.h>
 int
-main (void)
+main ()
 {
 return FFI_PASCAL
   ;
@@ -36835,38 +33490,34 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_ffi_pascal=yes
-else case e in #(
-  e) ac_cv_ffi_pascal=no ;;
-esac
+else
+  ac_cv_ffi_pascal=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_pascal" >&5
-printf "%s\n" "$ac_cv_ffi_pascal" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_pascal" >&5
+$as_echo "$ac_cv_ffi_pascal" >&6; }
 
   if test "$ac_cv_ffi_pascal" = yes; then
 
-printf "%s\n" "#define HAVE_FFI_PASCAL 1" >>confdefs.h
+$as_echo "#define HAVE_FFI_PASCAL 1" >>confdefs.h
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for register calling convention" >&5
-printf %s "checking for register calling convention... " >&6; }
-if test ${ac_cv_ffi_register+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for register calling convention" >&5
+$as_echo_n "checking for register calling convention... " >&6; }
+if ${ac_cv_ffi_register+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ffi.h>
 int
-main (void)
+main ()
 {
 return FFI_REGISTER
   ;
@@ -36874,38 +33525,34 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_ffi_register=yes
-else case e in #(
-  e) ac_cv_ffi_register=no ;;
-esac
+else
+  ac_cv_ffi_register=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_register" >&5
-printf "%s\n" "$ac_cv_ffi_register" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_register" >&5
+$as_echo "$ac_cv_ffi_register" >&6; }
 
   if test "$ac_cv_ffi_register" = yes; then
 
-printf "%s\n" "#define HAVE_FFI_REGISTER 1" >>confdefs.h
+$as_echo "#define HAVE_FFI_REGISTER 1" >>confdefs.h
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ms_cdecl calling convention" >&5
-printf %s "checking for ms_cdecl calling convention... " >&6; }
-if test ${ac_cv_ffi_ms_cdecl+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ms_cdecl calling convention" >&5
+$as_echo_n "checking for ms_cdecl calling convention... " >&6; }
+if ${ac_cv_ffi_ms_cdecl+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ffi.h>
 int
-main (void)
+main ()
 {
 return FFI_MS_CDECL
   ;
@@ -36913,38 +33560,34 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_ffi_ms_cdecl=yes
-else case e in #(
-  e) ac_cv_ffi_ms_cdecl=no ;;
-esac
+else
+  ac_cv_ffi_ms_cdecl=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_ms_cdecl" >&5
-printf "%s\n" "$ac_cv_ffi_ms_cdecl" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_ms_cdecl" >&5
+$as_echo "$ac_cv_ffi_ms_cdecl" >&6; }
 
   if test "$ac_cv_ffi_ms_cdecl" = yes; then
 
-printf "%s\n" "#define HAVE_FFI_MS_CDECL 1" >>confdefs.h
+$as_echo "#define HAVE_FFI_MS_CDECL 1" >>confdefs.h
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysv calling convention" >&5
-printf %s "checking for sysv calling convention... " >&6; }
-if test ${ac_cv_ffi_sysv+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysv calling convention" >&5
+$as_echo_n "checking for sysv calling convention... " >&6; }
+if ${ac_cv_ffi_sysv+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ffi.h>
 int
-main (void)
+main ()
 {
 return FFI_SYSV
   ;
@@ -36952,23 +33595,20 @@
 }
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_ffi_sysv=yes
-else case e in #(
-  e) ac_cv_ffi_sysv=no ;;
-esac
+else
+  ac_cv_ffi_sysv=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_sysv" >&5
-printf "%s\n" "$ac_cv_ffi_sysv" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ffi_sysv" >&5
+$as_echo "$ac_cv_ffi_sysv" >&6; }
 
   if test "$ac_cv_ffi_sysv" = yes; then
 
-printf "%s\n" "#define HAVE_FFI_SYSV 1" >>confdefs.h
+$as_echo "#define HAVE_FFI_SYSV 1" >>confdefs.h
 
   fi
 
@@ -37106,7 +33746,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_FFI 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_FFI 1
+_ACEOF
 
     fi
   fi
@@ -37238,18 +33880,16 @@
 
 php_enable_fileinfo=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fileinfo support" >&5
-printf %s "checking for fileinfo support... " >&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+y}
-then :
+if test "${enable_fileinfo+set}" = set; then :
   enableval=$enable_fileinfo; PHP_FILEINFO=$enableval
-else case e in #(
-  e)
+else
+
   PHP_FILEINFO=yes
   test "$PHP_ENABLE_ALL" && PHP_FILEINFO=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -37275,8 +33915,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -37291,14 +33931,13 @@
     libmagic/readcdf.c libmagic/softmagic.c libmagic/der.c \
     libmagic/buffer.c libmagic/is_csv.c"
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for strcasestr" >&5
-printf %s "checking for strcasestr... " >&6; }
-  if test "$cross_compiling" = yes
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: skipped, cross-compiling" >&5
-printf "%s\n" "skipped, cross-compiling" >&6; }
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strcasestr" >&5
+$as_echo_n "checking for strcasestr... " >&6; }
+  if test "$cross_compiling" = yes; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipped, cross-compiling" >&5
+$as_echo "skipped, cross-compiling" >&6; }
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <string.h>
@@ -37327,25 +33966,22 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: using libmagic strcasestr implementation" >&5
-printf "%s\n" "$as_me: using libmagic strcasestr implementation" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: using libmagic strcasestr implementation" >&5
+$as_echo "$as_me: using libmagic strcasestr implementation" >&6;}
     libmagic_sources="$libmagic_sources libmagic/strcasestr.c"
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
@@ -37483,7 +34119,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_FILEINFO 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_FILEINFO 1
+_ACEOF
 
     fi
   fi
@@ -37610,18 +34248,17 @@
 
 
 
-  ac_fn_c_check_func "$LINENO" "utimes" "ac_cv_func_utimes"
-if test "x$ac_cv_func_utimes" = xyes
-then :
-  printf "%s\n" "#define HAVE_UTIMES 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "strndup" "ac_cv_func_strndup"
-if test "x$ac_cv_func_strndup" = xyes
-then :
-  printf "%s\n" "#define HAVE_STRNDUP 1" >>confdefs.h
+  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"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
+done
 
 
 
@@ -37638,18 +34275,16 @@
 
 php_enable_filter=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable input filter support" >&5
-printf %s "checking whether to enable input filter support... " >&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+y}
-then :
+if test "${enable_filter+set}" = set; then :
   enableval=$enable_filter; PHP_FILTER=$enableval
-else case e in #(
-  e)
+else
+
   PHP_FILTER=yes
   test "$PHP_ENABLE_ALL" && PHP_FILTER=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -37675,8 +34310,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -37816,7 +34451,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_FILTER 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_FILTER 1
+_ACEOF
 
     fi
   fi
@@ -37986,18 +34623,16 @@
 
 php_enable_ftp=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable FTP support" >&5
-printf %s "checking whether to enable FTP support... " >&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+y}
-then :
+if test "${enable_ftp+set}" = set; then :
   enableval=$enable_ftp; PHP_FTP=$enableval
-else case e in #(
-  e)
+else
+
   PHP_FTP=no
   test "$PHP_ENABLE_ALL" && PHP_FTP=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -38023,8 +34658,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -38032,32 +34667,30 @@
 
 php_with_openssl_dir=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to explicitly enable FTP SSL support" >&5
-printf %s "checking whether to explicitly enable FTP SSL support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to explicitly enable FTP SSL support" >&5
+$as_echo_n "checking whether to explicitly enable FTP SSL support... " >&6; }
 
 # Check whether --with-openssl-dir was given.
-if test ${with_openssl_dir+y}
-then :
+if test "${with_openssl_dir+set}" = set; then :
   withval=$with_openssl_dir; PHP_OPENSSL_DIR=$withval
-else case e in #(
-  e)
+else
+
   PHP_OPENSSL_DIR=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_OPENSSL_DIR
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_FTP 1" >>confdefs.h
+$as_echo "#define HAVE_FTP 1" >>confdefs.h
 
 
   ext_builddir=ext/ftp
@@ -38193,7 +34826,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_FTP 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_FTP 1
+_ACEOF
 
     fi
   fi
@@ -38323,17 +34958,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
-printf %s "checking for openssl >= 1.0.2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
+$as_echo_n "checking for openssl >= 1.0.2... " >&6; }
 
 if test -n "$OPENSSL_CFLAGS"; then
     pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -38347,10 +34982,10 @@
     pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -38364,8 +34999,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -38391,10 +35026,10 @@
 and OPENSSL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -38404,12 +35039,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
 	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	found_openssl=yes
 fi
 
@@ -38561,7 +35196,7 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST FTP_SHARED_LIBADD"
 
 
-printf "%s\n" "#define HAVE_FTP_SSL 1" >>confdefs.h
+$as_echo "#define HAVE_FTP_SSL 1" >>confdefs.h
 
   fi
 fi
@@ -38572,18 +35207,16 @@
 
 php_enable_gd=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GD support" >&5
-printf %s "checking for GD support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GD support" >&5
+$as_echo_n "checking for GD support... " >&6; }
 # Check whether --enable-gd was given.
-if test ${enable_gd+y}
-then :
+if test "${enable_gd+set}" = set; then :
   enableval=$enable_gd; PHP_GD=$enableval
-else case e in #(
-  e)
+else
+
   PHP_GD=no
   test "$PHP_ENABLE_ALL" && PHP_GD=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -38609,8 +35242,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -38618,25 +35251,23 @@
 
 php_with_external_gd=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for external libgd" >&5
-printf %s "checking for external libgd... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for external libgd" >&5
+$as_echo_n "checking for external libgd... " >&6; }
 
 # Check whether --with-external-gd was given.
-if test ${with_external_gd+y}
-then :
+if test "${with_external_gd+set}" = set; then :
   withval=$with_external_gd; PHP_EXTERNAL_GD=$withval
-else case e in #(
-  e)
+else
+
   PHP_EXTERNAL_GD=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_EXTERNAL_GD
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -38645,25 +35276,23 @@
 
 php_with_avif=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libavif" >&5
-printf %s "checking for libavif... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libavif" >&5
+$as_echo_n "checking for libavif... " >&6; }
 
 # Check whether --with-avif was given.
-if test ${with_avif+y}
-then :
+if test "${with_avif+set}" = set; then :
   withval=$with_avif; PHP_AVIF=$withval
-else case e in #(
-  e)
+else
+
   PHP_AVIF=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_AVIF
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -38673,25 +35302,23 @@
 
 php_with_webp=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libwebp" >&5
-printf %s "checking for libwebp... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwebp" >&5
+$as_echo_n "checking for libwebp... " >&6; }
 
 # Check whether --with-webp was given.
-if test ${with_webp+y}
-then :
+if test "${with_webp+set}" = set; then :
   withval=$with_webp; PHP_WEBP=$withval
-else case e in #(
-  e)
+else
+
   PHP_WEBP=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_WEBP
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -38701,25 +35328,23 @@
 
 php_with_jpeg=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libjpeg" >&5
-printf %s "checking for libjpeg... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjpeg" >&5
+$as_echo_n "checking for libjpeg... " >&6; }
 
 # Check whether --with-jpeg was given.
-if test ${with_jpeg+y}
-then :
+if test "${with_jpeg+set}" = set; then :
   withval=$with_jpeg; PHP_JPEG=$withval
-else case e in #(
-  e)
+else
+
   PHP_JPEG=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_JPEG
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -38728,25 +35353,23 @@
 
 php_with_xpm=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libXpm" >&5
-printf %s "checking for libXpm... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libXpm" >&5
+$as_echo_n "checking for libXpm... " >&6; }
 
 # Check whether --with-xpm was given.
-if test ${with_xpm+y}
-then :
+if test "${with_xpm+set}" = set; then :
   withval=$with_xpm; PHP_XPM=$withval
-else case e in #(
-  e)
+else
+
   PHP_XPM=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_XPM
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -38754,25 +35377,23 @@
 
 php_with_freetype=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for FreeType 2" >&5
-printf %s "checking for FreeType 2... " >&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 was given.
-if test ${with_freetype+y}
-then :
+if test "${with_freetype+set}" = set; then :
   withval=$with_freetype; PHP_FREETYPE=$withval
-else case e in #(
-  e)
+else
+
   PHP_FREETYPE=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_FREETYPE
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -38780,24 +35401,22 @@
 
 php_enable_gd_jis_conv=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable JIS-mapped Japanese font support in GD" >&5
-printf %s "checking whether to enable JIS-mapped Japanese font support in GD... " >&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+y}
-then :
+if test "${enable_gd_jis_conv+set}" = set; then :
   enableval=$enable_gd_jis_conv; PHP_GD_JIS_CONV=$enableval
-else case e in #(
-  e)
+else
+
   PHP_GD_JIS_CONV=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_GD_JIS_CONV
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -38837,47 +35456,46 @@
                   libgd/gd_transform.c libgd/gd_crop.c libgd/gd_interpolation.c libgd/gd_matrix.c \
                   libgd/gd_bmp.c libgd/gd_tga.c"
 
-    ac_fn_c_check_func "$LINENO" "fabsf" "ac_cv_func_fabsf"
-if test "x$ac_cv_func_fabsf" = xyes
-then :
-  printf "%s\n" "#define HAVE_FABSF 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "floorf" "ac_cv_func_floorf"
-if test "x$ac_cv_func_floorf" = xyes
-then :
-  printf "%s\n" "#define HAVE_FLOORF 1" >>confdefs.h
+    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"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
+done
 
 
 
-printf "%s\n" "#define HAVE_GD_BUNDLED 1" >>confdefs.h
+$as_echo "#define HAVE_GD_BUNDLED 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_GD_PNG 1" >>confdefs.h
+$as_echo "#define HAVE_GD_PNG 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_GD_BMP 1" >>confdefs.h
+$as_echo "#define HAVE_GD_BMP 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_GD_TGA 1" >>confdefs.h
+$as_echo "#define HAVE_GD_TGA 1" >>confdefs.h
 
 
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5
-printf %s "checking for zlib... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5
+$as_echo_n "checking for zlib... " >&6; }
 
 if test -n "$ZLIB_CFLAGS"; then
     pkg_cv_ZLIB_CFLAGS="$ZLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
   ($PKG_CONFIG --exists --print-errors "zlib") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ZLIB_CFLAGS=`$PKG_CONFIG --cflags "zlib" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -38891,10 +35509,10 @@
     pkg_cv_ZLIB_LIBS="$ZLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
   ($PKG_CONFIG --exists --print-errors "zlib") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ZLIB_LIBS=`$PKG_CONFIG --libs "zlib" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -38908,8 +35526,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -38935,10 +35553,10 @@
 and ZLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -38948,12 +35566,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS
 	ZLIB_LIBS=$pkg_cv_ZLIB_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -39099,17 +35717,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpng" >&5
-printf %s "checking for libpng... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng" >&5
+$as_echo_n "checking for libpng... " >&6; }
 
 if test -n "$PNG_CFLAGS"; then
     pkg_cv_PNG_CFLAGS="$PNG_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libpng") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PNG_CFLAGS=`$PKG_CONFIG --cflags "libpng" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -39123,10 +35741,10 @@
     pkg_cv_PNG_LIBS="$PNG_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpng\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libpng") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PNG_LIBS=`$PKG_CONFIG --libs "libpng" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -39140,8 +35758,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -39167,10 +35785,10 @@
 and PNG_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -39180,12 +35798,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	PNG_CFLAGS=$pkg_cv_PNG_CFLAGS
 	PNG_LIBS=$pkg_cv_PNG_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -39328,24 +35946,24 @@
   done
 
 
-printf "%s\n" "#define HAVE_LIBPNG 1" >>confdefs.h
+$as_echo "#define HAVE_LIBPNG 1" >>confdefs.h
 
 
 
   if test "$PHP_AVIF" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libavif >= 0.8.2" >&5
-printf %s "checking for libavif >= 0.8.2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libavif >= 0.8.2" >&5
+$as_echo_n "checking for libavif >= 0.8.2... " >&6; }
 
 if test -n "$AVIF_CFLAGS"; then
     pkg_cv_AVIF_CFLAGS="$AVIF_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavif >= 0.8.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavif >= 0.8.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libavif >= 0.8.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_AVIF_CFLAGS=`$PKG_CONFIG --cflags "libavif >= 0.8.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -39359,10 +35977,10 @@
     pkg_cv_AVIF_LIBS="$AVIF_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavif >= 0.8.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavif >= 0.8.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libavif >= 0.8.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_AVIF_LIBS=`$PKG_CONFIG --libs "libavif >= 0.8.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -39376,8 +35994,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -39403,10 +36021,10 @@
 and AVIF_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -39416,12 +36034,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	AVIF_CFLAGS=$pkg_cv_AVIF_CFLAGS
 	AVIF_LIBS=$pkg_cv_AVIF_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -39564,10 +36182,10 @@
   done
 
 
-printf "%s\n" "#define HAVE_LIBAVIF 1" >>confdefs.h
+$as_echo "#define HAVE_LIBAVIF 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_GD_AVIF 1" >>confdefs.h
+$as_echo "#define HAVE_GD_AVIF 1" >>confdefs.h
 
   fi
 
@@ -39575,17 +36193,17 @@
   if test "$PHP_WEBP" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libwebp >= 0.2.0" >&5
-printf %s "checking for libwebp >= 0.2.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwebp >= 0.2.0" >&5
+$as_echo_n "checking for libwebp >= 0.2.0... " >&6; }
 
 if test -n "$WEBP_CFLAGS"; then
     pkg_cv_WEBP_CFLAGS="$WEBP_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebp >= 0.2.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebp >= 0.2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libwebp >= 0.2.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_WEBP_CFLAGS=`$PKG_CONFIG --cflags "libwebp >= 0.2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -39599,10 +36217,10 @@
     pkg_cv_WEBP_LIBS="$WEBP_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebp >= 0.2.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libwebp >= 0.2.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libwebp >= 0.2.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_WEBP_LIBS=`$PKG_CONFIG --libs "libwebp >= 0.2.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -39616,8 +36234,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -39643,10 +36261,10 @@
 and WEBP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -39656,12 +36274,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	WEBP_CFLAGS=$pkg_cv_WEBP_CFLAGS
 	WEBP_LIBS=$pkg_cv_WEBP_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -39804,10 +36422,10 @@
   done
 
 
-printf "%s\n" "#define HAVE_LIBWEBP 1" >>confdefs.h
+$as_echo "#define HAVE_LIBWEBP 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_GD_WEBP 1" >>confdefs.h
+$as_echo "#define HAVE_GD_WEBP 1" >>confdefs.h
 
   fi
 
@@ -39815,17 +36433,17 @@
   if test "$PHP_JPEG" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libjpeg" >&5
-printf %s "checking for libjpeg... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libjpeg" >&5
+$as_echo_n "checking for libjpeg... " >&6; }
 
 if test -n "$JPEG_CFLAGS"; then
     pkg_cv_JPEG_CFLAGS="$JPEG_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libjpeg\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libjpeg\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libjpeg") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_JPEG_CFLAGS=`$PKG_CONFIG --cflags "libjpeg" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -39839,10 +36457,10 @@
     pkg_cv_JPEG_LIBS="$JPEG_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libjpeg\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libjpeg\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libjpeg") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_JPEG_LIBS=`$PKG_CONFIG --libs "libjpeg" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -39856,8 +36474,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -39883,10 +36501,10 @@
 and JPEG_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -39896,12 +36514,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	JPEG_CFLAGS=$pkg_cv_JPEG_CFLAGS
 	JPEG_LIBS=$pkg_cv_JPEG_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -40044,10 +36662,10 @@
   done
 
 
-printf "%s\n" "#define HAVE_LIBJPEG 1" >>confdefs.h
+$as_echo "#define HAVE_LIBJPEG 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_GD_JPG 1" >>confdefs.h
+$as_echo "#define HAVE_GD_JPG 1" >>confdefs.h
 
   fi
 
@@ -40055,17 +36673,17 @@
   if test "$PHP_XPM" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xpm" >&5
-printf %s "checking for xpm... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xpm" >&5
+$as_echo_n "checking for xpm... " >&6; }
 
 if test -n "$XPM_CFLAGS"; then
     pkg_cv_XPM_CFLAGS="$XPM_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xpm\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xpm\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xpm") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_XPM_CFLAGS=`$PKG_CONFIG --cflags "xpm" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -40079,10 +36697,10 @@
     pkg_cv_XPM_LIBS="$XPM_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xpm\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xpm\""; } >&5
   ($PKG_CONFIG --exists --print-errors "xpm") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_XPM_LIBS=`$PKG_CONFIG --libs "xpm" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -40096,8 +36714,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -40123,10 +36741,10 @@
 and XPM_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -40136,12 +36754,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	XPM_CFLAGS=$pkg_cv_XPM_CFLAGS
 	XPM_LIBS=$pkg_cv_XPM_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -40284,10 +36902,10 @@
   done
 
 
-printf "%s\n" "#define HAVE_XPM 1" >>confdefs.h
+$as_echo "#define HAVE_XPM 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_GD_XPM 1" >>confdefs.h
+$as_echo "#define HAVE_GD_XPM 1" >>confdefs.h
 
   fi
 
@@ -40295,17 +36913,17 @@
   if test "$PHP_FREETYPE" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5
-printf %s "checking for freetype2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5
+$as_echo_n "checking for freetype2... " >&6; }
 
 if test -n "$FREETYPE2_CFLAGS"; then
     pkg_cv_FREETYPE2_CFLAGS="$FREETYPE2_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_FREETYPE2_CFLAGS=`$PKG_CONFIG --cflags "freetype2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -40319,10 +36937,10 @@
     pkg_cv_FREETYPE2_LIBS="$FREETYPE2_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"freetype2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "freetype2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_FREETYPE2_LIBS=`$PKG_CONFIG --libs "freetype2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -40336,8 +36954,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -40363,10 +36981,10 @@
 and FREETYPE2_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -40376,12 +36994,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	FREETYPE2_CFLAGS=$pkg_cv_FREETYPE2_CFLAGS
 	FREETYPE2_LIBS=$pkg_cv_FREETYPE2_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	FREETYPE2_FOUND=true
 fi
 
@@ -40525,20 +37143,20 @@
   done
 
 
-printf "%s\n" "#define HAVE_LIBFREETYPE 1" >>confdefs.h
+$as_echo "#define HAVE_LIBFREETYPE 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_GD_FREETYPE 1" >>confdefs.h
+$as_echo "#define HAVE_GD_FREETYPE 1" >>confdefs.h
 
   fi
 
 
   if test "$PHP_GD_JIS_CONV" = "yes"; then
 
-printf "%s\n" "#define USE_GD_JISX0208 1" >>confdefs.h
+$as_echo "#define USE_GD_JISX0208 1" >>confdefs.h
 
 
-printf "%s\n" "#define JISX0208 1" >>confdefs.h
+$as_echo "#define JISX0208 1" >>confdefs.h
 
   fi
 
@@ -40677,7 +37295,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_GD 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_GD 1
+_ACEOF
 
     fi
   fi
@@ -40820,22 +37440,20 @@
     }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     LIBS=$old_LIBS
 
 
-else case e in #(
-  e)
+else
+
     LIBS=$old_LIBS
 
       as_fn_error $? "GD build test failed. Please check the config.log for details." "$LINENO" 5
 
-   ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
@@ -40843,17 +37461,17 @@
     extra_sources="gd_compat.c"
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdlib >= 2.1.0" >&5
-printf %s "checking for gdlib >= 2.1.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdlib >= 2.1.0" >&5
+$as_echo_n "checking for gdlib >= 2.1.0... " >&6; }
 
 if test -n "$GDLIB_CFLAGS"; then
     pkg_cv_GDLIB_CFLAGS="$GDLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdlib >= 2.1.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdlib >= 2.1.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gdlib >= 2.1.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GDLIB_CFLAGS=`$PKG_CONFIG --cflags "gdlib >= 2.1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -40867,10 +37485,10 @@
     pkg_cv_GDLIB_LIBS="$GDLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdlib >= 2.1.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdlib >= 2.1.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gdlib >= 2.1.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_GDLIB_LIBS=`$PKG_CONFIG --libs "gdlib >= 2.1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -40884,8 +37502,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -40911,10 +37529,10 @@
 and GDLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -40924,12 +37542,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	GDLIB_CFLAGS=$pkg_cv_GDLIB_CFLAGS
 	GDLIB_LIBS=$pkg_cv_GDLIB_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -41072,7 +37690,7 @@
   done
 
 
-printf "%s\n" "#define HAVE_LIBGD 1" >>confdefs.h
+$as_echo "#define HAVE_LIBGD 1" >>confdefs.h
 
 
 
@@ -41080,22 +37698,21 @@
   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
   old_CFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromPng in libgd" >&5
-printf %s "checking for working gdImageCreateFromPng in libgd... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromPng in libgd" >&5
+$as_echo_n "checking for working gdImageCreateFromPng in libgd... " >&6; }
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -41116,25 +37733,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_GD_PNG 1" >>confdefs.h
+$as_echo "#define HAVE_GD_PNG 1" >>confdefs.h
 
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+else
+
+    { $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.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   ac_ext=c
@@ -41151,22 +37765,21 @@
   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
   old_CFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromAvif in libgd" >&5
-printf %s "checking for working gdImageCreateFromAvif in libgd... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromAvif in libgd" >&5
+$as_echo_n "checking for working gdImageCreateFromAvif in libgd... " >&6; }
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -41187,25 +37800,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_GD_AVIF 1" >>confdefs.h
+$as_echo "#define HAVE_GD_AVIF 1" >>confdefs.h
 
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+else
+
+    { $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.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   ac_ext=c
@@ -41222,22 +37832,21 @@
   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
   old_CFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromWebp in libgd" >&5
-printf %s "checking for working gdImageCreateFromWebp in libgd... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromWebp in libgd" >&5
+$as_echo_n "checking for working gdImageCreateFromWebp in libgd... " >&6; }
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -41258,25 +37867,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_GD_WEBP 1" >>confdefs.h
+$as_echo "#define HAVE_GD_WEBP 1" >>confdefs.h
 
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+else
+
+    { $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.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   ac_ext=c
@@ -41293,22 +37899,21 @@
   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
   old_CFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromJpeg in libgd" >&5
-printf %s "checking for working gdImageCreateFromJpeg in libgd... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromJpeg in libgd" >&5
+$as_echo_n "checking for working gdImageCreateFromJpeg in libgd... " >&6; }
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -41329,25 +37934,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_GD_JPG 1" >>confdefs.h
+$as_echo "#define HAVE_GD_JPG 1" >>confdefs.h
 
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+else
+
+    { $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.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   ac_ext=c
@@ -41364,22 +37966,21 @@
   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
   old_CFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromXpm in libgd" >&5
-printf %s "checking for working gdImageCreateFromXpm in libgd... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromXpm in libgd" >&5
+$as_echo_n "checking for working gdImageCreateFromXpm in libgd... " >&6; }
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -41400,25 +38001,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_GD_XPM 1" >>confdefs.h
+$as_echo "#define HAVE_GD_XPM 1" >>confdefs.h
 
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+else
+
+    { $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.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   ac_ext=c
@@ -41435,22 +38033,21 @@
   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
   old_CFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromBmp in libgd" >&5
-printf %s "checking for working gdImageCreateFromBmp in libgd... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromBmp in libgd" >&5
+$as_echo_n "checking for working gdImageCreateFromBmp in libgd... " >&6; }
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -41471,25 +38068,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_GD_BMP 1" >>confdefs.h
+$as_echo "#define HAVE_GD_BMP 1" >>confdefs.h
 
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+else
+
+    { $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.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   ac_ext=c
@@ -41506,22 +38100,21 @@
   LIBS="${LIBS} ${GD_SHARED_LIBADD}"
   old_CFLAGS="${CFLAGS}"
   CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromTga in libgd" >&5
-printf %s "checking for working gdImageCreateFromTga in libgd... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working gdImageCreateFromTga in libgd" >&5
+$as_echo_n "checking for working gdImageCreateFromTga in libgd... " >&6; }
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -41542,25 +38135,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_GD_TGA 1" >>confdefs.h
+$as_echo "#define HAVE_GD_TGA 1" >>confdefs.h
 
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+else
+
+    { $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.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   ac_ext=c
@@ -41677,66 +38267,57 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdFontCacheShutdown in -lgd" >&5
-printf %s "checking for gdFontCacheShutdown in -lgd... " >&6; }
-if test ${ac_cv_lib_gd_gdFontCacheShutdown+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdFontCacheShutdown in -lgd" >&5
+$as_echo_n "checking for gdFontCacheShutdown in -lgd... " >&6; }
+if ${ac_cv_lib_gd_gdFontCacheShutdown+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char gdFontCacheShutdown (void);
+char gdFontCacheShutdown ();
 int
-main (void)
+main ()
 {
 return gdFontCacheShutdown ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdFontCacheShutdown=yes
-else case e in #(
-  e) ac_cv_lib_gd_gdFontCacheShutdown=no ;;
-esac
+else
+  ac_cv_lib_gd_gdFontCacheShutdown=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdFontCacheShutdown" >&5
-printf "%s\n" "$ac_cv_lib_gd_gdFontCacheShutdown" >&6; }
-if test "x$ac_cv_lib_gd_gdFontCacheShutdown" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-printf "%s\n" "#define HAVE_GD_FREETYPE 1" >>confdefs.h
+$as_echo "#define HAVE_GD_FREETYPE 1" >>confdefs.h
+
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdFontCacheShutdown
 
-   ;;
-esac
+
 fi
 
 
@@ -41844,66 +38425,57 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdVersionString in -lgd" >&5
-printf %s "checking for gdVersionString in -lgd... " >&6; }
-if test ${ac_cv_lib_gd_gdVersionString+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdVersionString in -lgd" >&5
+$as_echo_n "checking for gdVersionString in -lgd... " >&6; }
+if ${ac_cv_lib_gd_gdVersionString+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char gdVersionString (void);
+char gdVersionString ();
 int
-main (void)
+main ()
 {
 return gdVersionString ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdVersionString=yes
-else case e in #(
-  e) ac_cv_lib_gd_gdVersionString=no ;;
-esac
+else
+  ac_cv_lib_gd_gdVersionString=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdVersionString" >&5
-printf "%s\n" "$ac_cv_lib_gd_gdVersionString" >&6; }
-if test "x$ac_cv_lib_gd_gdVersionString" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdVersionString" >&5
+$as_echo "$ac_cv_lib_gd_gdVersionString" >&6; }
+if test "x$ac_cv_lib_gd_gdVersionString" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-printf "%s\n" "#define HAVE_GD_LIBVERSION 1" >>confdefs.h
+$as_echo "#define HAVE_GD_LIBVERSION 1" >>confdefs.h
+
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdVersionString
 
-   ;;
-esac
+
 fi
 
 
@@ -42011,66 +38583,57 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdImageGetInterpolationMethod in -lgd" >&5
-printf %s "checking for gdImageGetInterpolationMethod in -lgd... " >&6; }
-if test ${ac_cv_lib_gd_gdImageGetInterpolationMethod+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageGetInterpolationMethod in -lgd" >&5
+$as_echo_n "checking for gdImageGetInterpolationMethod in -lgd... " >&6; }
+if ${ac_cv_lib_gd_gdImageGetInterpolationMethod+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char gdImageGetInterpolationMethod (void);
+char gdImageGetInterpolationMethod ();
 int
-main (void)
+main ()
 {
 return gdImageGetInterpolationMethod ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageGetInterpolationMethod=yes
-else case e in #(
-  e) ac_cv_lib_gd_gdImageGetInterpolationMethod=no ;;
-esac
+else
+  ac_cv_lib_gd_gdImageGetInterpolationMethod=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageGetInterpolationMethod" >&5
-printf "%s\n" "$ac_cv_lib_gd_gdImageGetInterpolationMethod" >&6; }
-if test "x$ac_cv_lib_gd_gdImageGetInterpolationMethod" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageGetInterpolationMethod" >&5
+$as_echo "$ac_cv_lib_gd_gdImageGetInterpolationMethod" >&6; }
+if test "x$ac_cv_lib_gd_gdImageGetInterpolationMethod" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
-printf "%s\n" "#define HAVE_GD_GET_INTERPOLATION 1" >>confdefs.h
+$as_echo "#define HAVE_GD_GET_INTERPOLATION 1" >>confdefs.h
+
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageGetInterpolationMethod
 
-   ;;
-esac
+
 fi
 
 
@@ -42209,7 +38772,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_GD 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_GD 1
+_ACEOF
 
     fi
   fi
@@ -42436,66 +39001,57 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gdImageCreate in -lgd" >&5
-printf %s "checking for gdImageCreate in -lgd... " >&6; }
-if test ${ac_cv_lib_gd_gdImageCreate+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdImageCreate in -lgd" >&5
+$as_echo_n "checking for gdImageCreate in -lgd... " >&6; }
+if ${ac_cv_lib_gd_gdImageCreate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgd  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char gdImageCreate (void);
+char gdImageCreate ();
 int
-main (void)
+main ()
 {
 return gdImageCreate ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gd_gdImageCreate=yes
-else case e in #(
-  e) ac_cv_lib_gd_gdImageCreate=no ;;
-esac
+else
+  ac_cv_lib_gd_gdImageCreate=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gd_gdImageCreate" >&5
-printf "%s\n" "$ac_cv_lib_gd_gdImageCreate" >&6; }
-if test "x$ac_cv_lib_gd_gdImageCreate" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gd_gdImageCreate
 
       as_fn_error $? "GD build test failed. Please check the config.log for details." "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
   fi
@@ -42538,19 +39094,17 @@
 
 php_with_gettext=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext support" >&5
-printf %s "checking for GNU gettext support... " >&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+y}
-then :
+if test "${with_gettext+set}" = set; then :
   withval=$with_gettext; PHP_GETTEXT=$withval
-else case e in #(
-  e)
+else
+
   PHP_GETTEXT=no
   test "$PHP_ENABLE_ALL" && PHP_GETTEXT=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -42576,8 +39130,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -42596,119 +39150,101 @@
 
   O_LDFLAGS=$LDFLAGS
   LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
-printf %s "checking for bindtextdomain in -lintl... " >&6; }
-if test ${ac_cv_lib_intl_bindtextdomain+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
+$as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
+if ${ac_cv_lib_intl_bindtextdomain+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lintl  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char bindtextdomain (void);
+char bindtextdomain ();
 int
-main (void)
+main ()
 {
 return bindtextdomain ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_intl_bindtextdomain=yes
-else case e in #(
-  e) ac_cv_lib_intl_bindtextdomain=no ;;
-esac
+else
+  ac_cv_lib_intl_bindtextdomain=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
-printf "%s\n" "$ac_cv_lib_intl_bindtextdomain" >&6; }
-if test "x$ac_cv_lib_intl_bindtextdomain" = xyes
-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" = xyes; then :
 
 	GETTEXT_LIBS=intl
 	GETTEXT_CHECK_IN_LIB=intl
 
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lc" >&5
-printf %s "checking for bindtextdomain in -lc... " >&6; }
-if test ${ac_cv_lib_c_bindtextdomain+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lc" >&5
+$as_echo_n "checking for bindtextdomain in -lc... " >&6; }
+if ${ac_cv_lib_c_bindtextdomain+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 /* Override any GCC internal prototype to avoid an error.
    Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char bindtextdomain (void);
+char bindtextdomain ();
 int
-main (void)
+main ()
 {
 return bindtextdomain ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_c_bindtextdomain=yes
-else case e in #(
-  e) ac_cv_lib_c_bindtextdomain=no ;;
-esac
+else
+  ac_cv_lib_c_bindtextdomain=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_bindtextdomain" >&5
-printf "%s\n" "$ac_cv_lib_c_bindtextdomain" >&6; }
-if test "x$ac_cv_lib_c_bindtextdomain" = xyes
-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" = xyes; then :
 
 		GETTEXT_LIBS=
 		GETTEXT_CHECK_IN_LIB=c
 
-else case e in #(
-  e)
+else
+
 		as_fn_error $? "Unable to find required gettext library" "$LINENO" 5
-	 ;;
-esac
+
 fi
 
-   ;;
-esac
+
 fi
 
 
 
-printf "%s\n" "#define HAVE_LIBINTL 1" >>confdefs.h
+$as_echo "#define HAVE_LIBINTL 1" >>confdefs.h
 
 
   ext_builddir=ext/gettext
@@ -42844,7 +39380,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_GETTEXT 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_GETTEXT 1
+_ACEOF
 
     fi
   fi
@@ -43001,211 +39539,179 @@
   fi
 
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$GETTEXT_CHECK_IN_LIB""_ngettext" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
-printf %s "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  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 eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char ngettext (void);
+char ngettext ();
 int
-main (void)
+main ()
 {
 return ngettext ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
-
-printf "%s\n" "#define HAVE_NGETTEXT 1" >>confdefs.h
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+
+$as_echo "#define HAVE_NGETTEXT 1" >>confdefs.h
 
 fi
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$GETTEXT_CHECK_IN_LIB""_dngettext" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
-printf %s "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  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 eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dngettext (void);
+char dngettext ();
 int
-main (void)
+main ()
 {
 return dngettext ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
-
-printf "%s\n" "#define HAVE_DNGETTEXT 1" >>confdefs.h
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+
+$as_echo "#define HAVE_DNGETTEXT 1" >>confdefs.h
 
 fi
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$GETTEXT_CHECK_IN_LIB""_dcngettext" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
-printf %s "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  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 eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dcngettext (void);
+char dcngettext ();
 int
-main (void)
+main ()
 {
 return dcngettext ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
-
-printf "%s\n" "#define HAVE_DCNGETTEXT 1" >>confdefs.h
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+
+$as_echo "#define HAVE_DCNGETTEXT 1" >>confdefs.h
 
 fi
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$GETTEXT_CHECK_IN_LIB""_bind_textdomain_codeset" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
-printf %s "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  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 eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$GETTEXT_CHECK_IN_LIB  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char bind_textdomain_codeset (void);
+char bind_textdomain_codeset ();
 int
-main (void)
+main ()
 {
 return bind_textdomain_codeset ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
-printf "%s\n" "#define HAVE_BIND_TEXTDOMAIN_CODESET 1" >>confdefs.h
+$as_echo "#define HAVE_BIND_TEXTDOMAIN_CODESET 1" >>confdefs.h
 
 fi
 
@@ -43318,19 +39824,17 @@
 
 php_with_gmp=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU MP support" >&5
-printf %s "checking for GNU MP support... " >&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+y}
-then :
+if test "${with_gmp+set}" = set; then :
   withval=$with_gmp; PHP_GMP=$withval
-else case e in #(
-  e)
+else
+
   PHP_GMP=no
   test "$PHP_ENABLE_ALL" && PHP_GMP=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -43356,8 +39860,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -43469,66 +39973,57 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __gmpz_rootrem in -lgmp" >&5
-printf %s "checking for __gmpz_rootrem in -lgmp... " >&6; }
-if test ${ac_cv_lib_gmp___gmpz_rootrem+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gmpz_rootrem in -lgmp" >&5
+$as_echo_n "checking for __gmpz_rootrem in -lgmp... " >&6; }
+if ${ac_cv_lib_gmp___gmpz_rootrem+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgmp  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __gmpz_rootrem (void);
+char __gmpz_rootrem ();
 int
-main (void)
+main ()
 {
 return __gmpz_rootrem ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gmp___gmpz_rootrem=yes
-else case e in #(
-  e) ac_cv_lib_gmp___gmpz_rootrem=no ;;
-esac
+else
+  ac_cv_lib_gmp___gmpz_rootrem=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpz_rootrem" >&5
-printf "%s\n" "$ac_cv_lib_gmp___gmpz_rootrem" >&6; }
-if test "x$ac_cv_lib_gmp___gmpz_rootrem" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpz_rootrem" >&5
+$as_echo "$ac_cv_lib_gmp___gmpz_rootrem" >&6; }
+if test "x$ac_cv_lib_gmp___gmpz_rootrem" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gmp___gmpz_rootrem
 
       as_fn_error $? "GNU MP Library version 4.2 or greater required." "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
 
@@ -43667,66 +40162,57 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __gmpz_rootrem in -lgmp" >&5
-printf %s "checking for __gmpz_rootrem in -lgmp... " >&6; }
-if test ${ac_cv_lib_gmp___gmpz_rootrem+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __gmpz_rootrem in -lgmp" >&5
+$as_echo_n "checking for __gmpz_rootrem in -lgmp... " >&6; }
+if ${ac_cv_lib_gmp___gmpz_rootrem+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgmp  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __gmpz_rootrem (void);
+char __gmpz_rootrem ();
 int
-main (void)
+main ()
 {
 return __gmpz_rootrem ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gmp___gmpz_rootrem=yes
-else case e in #(
-  e) ac_cv_lib_gmp___gmpz_rootrem=no ;;
-esac
+else
+  ac_cv_lib_gmp___gmpz_rootrem=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpz_rootrem" >&5
-printf "%s\n" "$ac_cv_lib_gmp___gmpz_rootrem" >&6; }
-if test "x$ac_cv_lib_gmp___gmpz_rootrem" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpz_rootrem" >&5
+$as_echo "$ac_cv_lib_gmp___gmpz_rootrem" >&6; }
+if test "x$ac_cv_lib_gmp___gmpz_rootrem" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gmp___gmpz_rootrem
 
       as_fn_error $? "GNU MP Library version 4.2 or greater required." "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
 
@@ -44013,7 +40499,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_GMP 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_GMP 1
+_ACEOF
 
     fi
   fi
@@ -44138,7 +40626,7 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST GMP_SHARED_LIBADD"
 
 
-printf "%s\n" "#define HAVE_GMP 1" >>confdefs.h
+$as_echo "#define HAVE_GMP 1" >>confdefs.h
 
 fi
 
@@ -44148,19 +40636,17 @@
 
 php_with_mhash=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mhash support" >&5
-printf %s "checking for mhash support... " >&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+y}
-then :
+if test "${with_mhash+set}" = set; then :
   withval=$with_mhash; PHP_MHASH=$withval
-else case e in #(
-  e)
+else
+
   PHP_MHASH=no
   test "$PHP_ENABLE_ALL" && PHP_MHASH=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -44186,8 +40672,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -44198,113 +40684,103 @@
   fi
 
 
-printf "%s\n" "#define PHP_MHASH_BC 1" >>confdefs.h
+$as_echo "#define PHP_MHASH_BC 1" >>confdefs.h
 
 fi
 
 if test $ac_cv_c_bigendian_php = yes; then
   EXT_HASH_SHA3_SOURCES="hash_sha3.c"
 
-printf "%s\n" "#define HAVE_SLOW_HASH3 1" >>confdefs.h
+$as_echo "#define HAVE_SLOW_HASH3 1" >>confdefs.h
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: \"Use SHA3 slow implementation on bigendian\"" >&5
-printf "%s\n" "$as_me: WARNING: \"Use SHA3 slow implementation on bigendian\"" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Use SHA3 slow implementation on bigendian\"" >&5
+$as_echo "$as_me: WARNING: \"Use SHA3 slow implementation on bigendian\"" >&2;}
 else
   # 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]];'.
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-printf %s "checking size of long... " >&6; }
-if test ${ac_cv_sizeof_long+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_long" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if ${ac_cv_sizeof_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-printf "%s\n" "$ac_cv_sizeof_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
-printf %s "checking if we're at 64-bit platform... " >&6; }
-  if test "$ac_cv_sizeof_long" -eq 4
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
+$as_echo_n "checking if we're at 64-bit platform... " >&6; }
+  if test "$ac_cv_sizeof_long" -eq 4; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     SHA3_DIR="sha3/generic32lc"
     SHA3_OPT_SRC="$SHA3_DIR/KeccakP-1600-inplace32BI.c"
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     SHA3_DIR="sha3/generic64lc"
     SHA3_OPT_SRC="$SHA3_DIR/KeccakP-1600-opt64.c"
-   ;;
-esac
+
 fi
   EXT_HASH_SHA3_SOURCES="$SHA3_OPT_SRC $SHA3_DIR/KeccakHash.c $SHA3_DIR/KeccakSponge.c hash_sha3.c"
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-implicit-fallthrough" >&5
-printf %s "checking whether C compiler accepts -Wno-implicit-fallthrough... " >&6; }
-if test ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-implicit-fallthrough" >&5
+$as_echo_n "checking whether C compiler accepts -Wno-implicit-fallthrough... " >&6; }
+if ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wno-implicit-fallthrough"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5
+$as_echo "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes; then :
   PHP_HASH_CFLAGS="$PHP_HASH_CFLAGS -Wno-implicit-fallthrough"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
 
@@ -44468,7 +40944,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_HASH 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_HASH 1
+_ACEOF
 
     fi
   fi
@@ -44616,19 +41094,17 @@
 
 php_with_iconv=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv support" >&5
-printf %s "checking for iconv support... " >&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+y}
-then :
+if test "${with_iconv+set}" = set; then :
   withval=$with_iconv; PHP_ICONV=$withval
-else case e in #(
-  e)
+else
+
   PHP_ICONV=yes
   test "$PHP_ENABLE_ALL" && PHP_ICONV=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -44654,8 +41130,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -44670,26 +41146,23 @@
         LIBS_save="$LIBS"
     LIBS=
     ac_fn_c_check_func "$LINENO" "iconv" "ac_cv_func_iconv"
-if test "x$ac_cv_func_iconv" = xyes
-then :
+if test "x$ac_cv_func_iconv" = xyes; then :
 
       found_iconv=yes
 
-else case e in #(
-  e)
+else
+
       ac_fn_c_check_func "$LINENO" "libiconv" "ac_cv_func_libiconv"
-if test "x$ac_cv_func_libiconv" = xyes
-then :
+if test "x$ac_cv_func_libiconv" = xyes; then :
 
 
-printf "%s\n" "#define HAVE_LIBICONV 1" >>confdefs.h
+$as_echo "#define HAVE_LIBICONV 1" >>confdefs.h
 
         found_iconv=yes
 
 fi
 
-     ;;
-esac
+
 fi
 
     LIBS="$LIBS_save"
@@ -44826,68 +41299,60 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$iconv_lib_name""_libiconv" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libiconv in -l$iconv_lib_name" >&5
-printf %s "checking for libiconv in -l$iconv_lib_name... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  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 eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$iconv_lib_name  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char libiconv (void);
+char libiconv ();
 int
-main (void)
+main ()
 {
 return libiconv ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
         found_iconv=yes
 
-printf "%s\n" "#define HAVE_LIBICONV 1" >>confdefs.h
+$as_echo "#define HAVE_LIBICONV 1" >>confdefs.h
+
 
+$as_echo "#define ICONV_ALIASED_LIBICONV 1" >>confdefs.h
 
-printf "%s\n" "#define ICONV_ALIASED_LIBICONV 1" >>confdefs.h
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$iconv_lib_name_libiconv
@@ -44999,53 +41464,45 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$iconv_lib_name""_iconv" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv in -l$iconv_lib_name" >&5
-printf %s "checking for iconv in -l$iconv_lib_name... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  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 eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$iconv_lib_name  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char iconv (void);
+char iconv ();
 int
-main (void)
+main ()
 {
 return iconv ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -45053,19 +41510,17 @@
           found_iconv=yes
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$iconv_lib_name_iconv
 
-   ;;
-esac
+
 fi
 
 
-   ;;
-esac
+
 fi
 
     fi
@@ -45073,7 +41528,7 @@
 
   if test "$found_iconv" = "yes"; then
 
-printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h
+$as_echo "#define HAVE_ICONV 1" >>confdefs.h
 
     if test -n "$ICONV_DIR"; then
 
@@ -45220,47 +41675,44 @@
     LDFLAGS="$ICONV_SHARED_LIBADD $LDFLAGS"
     CFLAGS="$INCLUDES $CFLAGS"
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if iconv is glibc's" >&5
-printf %s "checking if iconv is glibc's... " >&6; }
+    { $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
-main (void)
+main ()
 {
 gnu_get_libc_version();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       iconv_impl_name="glibc"
 
-else case e in #(
-  e)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-     ;;
-esac
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
     if test -z "$iconv_impl_name"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if using GNU libiconv" >&5
-printf %s "checking if using GNU libiconv... " >&6; }
-      if test "$cross_compiling" = yes
-then :
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if using GNU libiconv" >&5
+$as_echo_n "checking if using GNU libiconv... " >&6; }
+      if test "$cross_compiling" = yes; then :
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, cross-compiling" >&5
-printf "%s\n" "no, cross-compiling" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, cross-compiling" >&5
+$as_echo "no, cross-compiling" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <iconv.h>
@@ -45270,138 +41722,130 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
         iconv_impl_name="gnu_libiconv"
 
-else case e in #(
-  e)
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-       ;;
-esac
+else
+
+        { $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.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     fi
 
     if test -z "$iconv_impl_name"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if iconv is Konstantin Chuguev's" >&5
-printf %s "checking if iconv is Konstantin Chuguev's... " >&6; }
+      { $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
-main (void)
+main ()
 {
 iconv_ccs_init(NULL, NULL);
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
         iconv_impl_name="bsd"
 
-else case e in #(
-  e)
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-       ;;
-esac
+else
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     fi
 
     if test -z "$iconv_impl_name"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if using IBM iconv" >&5
-printf %s "checking if using IBM iconv... " >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if using IBM iconv" >&5
+$as_echo_n "checking if using IBM iconv... " >&6; }
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <iconv.h>
 int
-main (void)
+main ()
 {
 cstoccsid("");
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
         iconv_impl_name="ibm"
 
-else case e in #(
-  e)
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-       ;;
-esac
+else
+
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     fi
 
     case "$iconv_impl_name" in
       gnu_libiconv )
 
-printf "%s\n" "#define PHP_ICONV_IMPL \"libiconv\"" >>confdefs.h
+$as_echo "#define PHP_ICONV_IMPL \"libiconv\"" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBICONV 1" >>confdefs.h
+$as_echo "#define HAVE_LIBICONV 1" >>confdefs.h
 
         ;;
 
       bsd )
 
-printf "%s\n" "#define HAVE_BSD_ICONV 1" >>confdefs.h
+$as_echo "#define HAVE_BSD_ICONV 1" >>confdefs.h
 
 
-printf "%s\n" "#define PHP_ICONV_IMPL \"BSD iconv\"" >>confdefs.h
+$as_echo "#define PHP_ICONV_IMPL \"BSD iconv\"" >>confdefs.h
 
         ;;
 
       glibc )
 
-printf "%s\n" "#define HAVE_GLIBC_ICONV 1" >>confdefs.h
+$as_echo "#define HAVE_GLIBC_ICONV 1" >>confdefs.h
 
 
-printf "%s\n" "#define PHP_ICONV_IMPL \"glibc\"" >>confdefs.h
+$as_echo "#define PHP_ICONV_IMPL \"glibc\"" >>confdefs.h
 
         ;;
       ibm )
 
-printf "%s\n" "#define HAVE_IBM_ICONV 1" >>confdefs.h
+$as_echo "#define HAVE_IBM_ICONV 1" >>confdefs.h
 
 
-printf "%s\n" "#define PHP_ICONV_IMPL \"IBM iconv\"" >>confdefs.h
+$as_echo "#define PHP_ICONV_IMPL \"IBM iconv\"" >>confdefs.h
 
         ;;
     esac
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if iconv supports errno" >&5
-printf %s "checking if iconv supports errno... " >&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 :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <iconv.h>
@@ -45422,39 +41866,35 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-else case e in #(
-  e)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       as_fn_error $? "iconv does not support errno" "$LINENO" 5
-     ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if iconv supports //IGNORE" >&5
-printf %s "checking if iconv supports //IGNORE... " >&6; }
-    if test "$cross_compiling" = yes
-then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv supports //IGNORE" >&5
+$as_echo_n "checking if iconv supports //IGNORE... " >&6; }
+    if test "$cross_compiling" = yes; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-printf "%s\n" "#define ICONV_BROKEN_IGNORE 0" >>confdefs.h
+$as_echo "#define ICONV_BROKEN_IGNORE 0" >>confdefs.h
 
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <iconv.h>
@@ -45477,28 +41917,25 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define ICONV_BROKEN_IGNORE 0" >>confdefs.h
+$as_echo "#define ICONV_BROKEN_IGNORE 0" >>confdefs.h
 
 
-else case e in #(
-  e)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define ICONV_BROKEN_IGNORE 1" >>confdefs.h
 
-printf "%s\n" "#define ICONV_BROKEN_IGNORE 1" >>confdefs.h
 
-     ;;
-esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
@@ -45639,7 +42076,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_ICONV 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_ICONV 1
+_ACEOF
 
     fi
   fi
@@ -45802,19 +42241,17 @@
 
 php_with_imap=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IMAP support" >&5
-printf %s "checking for IMAP support... " >&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+y}
-then :
+if test "${with_imap+set}" = set; then :
   withval=$with_imap; PHP_IMAP=$withval
-else case e in #(
-  e)
+else
+
   PHP_IMAP=no
   test "$PHP_ENABLE_ALL" && PHP_IMAP=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -45840,8 +42277,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -45849,25 +42286,23 @@
 
 php_with_kerberos=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IMAP Kerberos support" >&5
-printf %s "checking for IMAP Kerberos support... " >&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+y}
-then :
+if test "${with_kerberos+set}" = set; then :
   withval=$with_kerberos; PHP_KERBEROS=$withval
-else case e in #(
-  e)
+else
+
   PHP_KERBEROS=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_KERBEROS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -45875,25 +42310,23 @@
 
 php_with_imap_ssl=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IMAP SSL support" >&5
-printf %s "checking for IMAP SSL support... " >&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+y}
-then :
+if test "${with_imap_ssl+set}" = set; then :
   withval=$with_imap_ssl; PHP_IMAP_SSL=$withval
-else case e in #(
-  e)
+else
+
   PHP_IMAP_SSL=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_IMAP_SSL
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -46036,7 +42469,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_IMAP 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_IMAP 1
+_ACEOF
 
     fi
   fi
@@ -46158,13 +42593,13 @@
   fi
 
 
-printf "%s\n" "#define HAVE_IMAP 1" >>confdefs.h
+$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
 
-printf "%s\n" "#define HAVE_IMAP2000 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i
@@ -46176,7 +42611,7 @@
 
       elif test -r "$i/include/c-client/c-client.h"; then
 
-printf "%s\n" "#define HAVE_IMAP2000 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/include/c-client
@@ -46188,7 +42623,7 @@
 
       elif test -r "$i/include/imap/c-client.h"; then
 
-printf "%s\n" "#define HAVE_IMAP2000 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/include/imap
@@ -46200,7 +42635,7 @@
 
       elif test -r "$i/include/c-client.h"; then
 
-printf "%s\n" "#define HAVE_IMAP2000 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/include
@@ -46212,7 +42647,7 @@
 
       elif test -r "$i/imap/c-client.h"; then
 
-printf "%s\n" "#define HAVE_IMAP2000 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/imap
@@ -46224,7 +42659,7 @@
 
       elif test -r "$i/c-client/c-client.h"; then
 
-printf "%s\n" "#define HAVE_IMAP2000 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP2000 1" >>confdefs.h
 
     IMAP_DIR=$i
     IMAP_INC_DIR=$i/c-client
@@ -46243,33 +42678,31 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "mail_fetch_overview_sequence" >/dev/null 2>&1
-then :
+  $EGREP "mail_fetch_overview_sequence" >/dev/null 2>&1; then :
 
 
-printf "%s\n" "#define HAVE_IMAP2004 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP2004 1" >>confdefs.h
 
 
 fi
-rm -rf conftest*
+rm -f conftest*
 
 
         old_CFLAGS=$CFLAGS
     CFLAGS="-I$IMAP_INC_DIR"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for utf8_mime2text signature" >&5
-printf %s "checking for utf8_mime2text signature... " >&6; }
-if test ${ac_cv_utf8_mime2text+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utf8_mime2text signature" >&5
+$as_echo_n "checking for utf8_mime2text signature... " >&6; }
+if ${ac_cv_utf8_mime2text+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
 #include <c-client.h>
 
 int
-main (void)
+main ()
 {
 
         SIZEDTEXT *src, *dst;
@@ -46279,45 +42712,41 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
         ac_cv_utf8_mime2text=old
 
-else case e in #(
-  e)
+else
+
         ac_cv_utf8_mime2text=new
-       ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-     ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_utf8_mime2text" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_NEW_MIME2TEXT 1" >>confdefs.h
+$as_echo "#define HAVE_NEW_MIME2TEXT 1" >>confdefs.h
 
     fi
     CFLAGS=$old_CFLAGS
 
     old_CFLAGS=$CFLAGS
     CFLAGS="-I$IMAP_INC_DIR"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for U8T_DECOMPOSE" >&5
-printf %s "checking for U8T_DECOMPOSE... " >&6; }
-if test ${ac_cv_u8t_decompose+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for U8T_DECOMPOSE" >&5
+$as_echo_n "checking for U8T_DECOMPOSE... " >&6; }
+if ${ac_cv_u8t_decompose+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <c-client.h>
 
 int
-main (void)
+main ()
 {
 
          int i = U8T_CANONICAL;
@@ -46326,23 +42755,20 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
          ac_cv_u8t_decompose=yes
 
-else case e in #(
-  e)
+else
+
          ac_cv_u8t_decompose=no
-       ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-     ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_u8t_decompose" >&5
-printf "%s\n" "$ac_cv_u8t_decompose" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_u8t_decompose" >&5
+$as_echo "$ac_cv_u8t_decompose" >&6; }
     CFLAGS=$old_CFLAGS
 
     if test "$ac_cv_u8t_decompose" = "no" && test "$ac_cv_utf8_mime2text" = "new"; then
@@ -46364,15 +42790,14 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "this_is_true" >/dev/null 2>&1
-then :
+  $EGREP "this_is_true" >/dev/null 2>&1; then :
 
 
-printf "%s\n" "#define HAVE_IMAP2001 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP2001 1" >>confdefs.h
 
 
 fi
-rm -rf conftest*
+rm -f conftest*
 
     CPPFLAGS=$old_CPPFLAGS
 
@@ -46481,51 +42906,43 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5
-printf %s "checking for pam_start in -lpam... " >&6; }
-if test ${ac_cv_lib_pam_pam_start+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_pam_pam_start+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpam  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char pam_start (void);
+char pam_start ();
 int
-main (void)
+main ()
 {
 return pam_start ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pam_pam_start=yes
-else case e in #(
-  e) ac_cv_lib_pam_pam_start=no ;;
-esac
+else
+  ac_cv_lib_pam_pam_start=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5
-printf "%s\n" "$ac_cv_lib_pam_pam_start" >&6; }
-if test "x$ac_cv_lib_pam_pam_start" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -46554,18 +42971,17 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBPAM 1" >>confdefs.h
+$as_echo "#define HAVE_LIBPAM 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_pam_pam_start
 
-   ;;
-esac
+
 fi
 
 
@@ -46674,51 +43090,43 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
-printf %s "checking for crypt in -lcrypt... " >&6; }
-if test ${ac_cv_lib_crypt_crypt+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
+$as_echo_n "checking for crypt in -lcrypt... " >&6; }
+if ${ac_cv_lib_crypt_crypt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char crypt (void);
+char crypt ();
 int
-main (void)
+main ()
 {
 return crypt ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_crypt_crypt=yes
-else case e in #(
-  e) ac_cv_lib_crypt_crypt=no ;;
-esac
+else
+  ac_cv_lib_crypt_crypt=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
-printf "%s\n" "$ac_cv_lib_crypt_crypt" >&6; }
-if test "x$ac_cv_lib_crypt_crypt" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -46747,18 +43155,17 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBCRYPT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBCRYPT 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_crypt_crypt
 
-   ;;
-esac
+
 fi
 
 
@@ -46900,17 +43307,17 @@
   if test "$PHP_KERBEROS" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for krb5-gssapi krb5" >&5
-printf %s "checking for krb5-gssapi krb5... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5-gssapi krb5" >&5
+$as_echo_n "checking for krb5-gssapi krb5... " >&6; }
 
 if test -n "$KERBEROS_CFLAGS"; then
     pkg_cv_KERBEROS_CFLAGS="$KERBEROS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
   ($PKG_CONFIG --exists --print-errors "krb5-gssapi krb5") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_KERBEROS_CFLAGS=`$PKG_CONFIG --cflags "krb5-gssapi krb5" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -46924,10 +43331,10 @@
     pkg_cv_KERBEROS_LIBS="$KERBEROS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"krb5-gssapi krb5\""; } >&5
   ($PKG_CONFIG --exists --print-errors "krb5-gssapi krb5") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_KERBEROS_LIBS=`$PKG_CONFIG --libs "krb5-gssapi krb5" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -46941,8 +43348,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -46968,10 +43375,10 @@
 and KERBEROS_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -46981,12 +43388,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	KERBEROS_CFLAGS=$pkg_cv_KERBEROS_CFLAGS
 	KERBEROS_LIBS=$pkg_cv_KERBEROS_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -47131,7 +43538,7 @@
 
 
 
-printf "%s\n" "#define HAVE_IMAP_KRB 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP_KRB 1" >>confdefs.h
 
   else
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -47140,8 +43547,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "auth_gss" >/dev/null 2>&1
-then :
+  $EGREP "auth_gss" >/dev/null 2>&1; then :
 
       as_fn_error $? "This c-client library is built with Kerberos support.
 
@@ -47149,7 +43555,7 @@
       " "$LINENO" 5
 
 fi
-rm -rf conftest*
+rm -f conftest*
 
   fi
 
@@ -47163,17 +43569,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
-printf %s "checking for openssl >= 1.0.2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
+$as_echo_n "checking for openssl >= 1.0.2... " >&6; }
 
 if test -n "$OPENSSL_CFLAGS"; then
     pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -47187,10 +43593,10 @@
     pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -47204,8 +43610,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -47231,10 +43637,10 @@
 and OPENSSL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -47244,12 +43650,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
 	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	found_openssl=yes
 fi
 
@@ -47395,7 +43801,7 @@
 
 
 
-printf "%s\n" "#define HAVE_IMAP_SSL 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP_SSL 1" >>confdefs.h
 
 
 else
@@ -47413,8 +43819,7 @@
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP_TRADITIONAL "ssl_onceonlyinit" >/dev/null 2>&1
-then :
+  $EGREP "ssl_onceonlyinit" >/dev/null 2>&1; then :
 
       as_fn_error $? "This c-client library is built with SSL support.
 
@@ -47422,7 +43827,7 @@
       " "$LINENO" 5
 
 fi
-rm -rf conftest*
+rm -f conftest*
 
   fi
 
@@ -47467,24 +43872,22 @@
     }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     LIBS=$old_LIBS
 
 
-printf "%s\n" "#define HAVE_IMAP_AUTH_GSS 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP_AUTH_GSS 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LIBS=$old_LIBS
 
-   ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
@@ -47497,17 +43900,16 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for utf8_to_mutf7" >&5
-printf %s "checking for utf8_to_mutf7... " >&6; }
-if test ${ac_cv_utf8_to_mutf7+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utf8_to_mutf7" >&5
+$as_echo_n "checking for utf8_to_mutf7... " >&6; }
+if ${ac_cv_utf8_to_mutf7+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <c-client.h>
 int
-main (void)
+main ()
 {
 
         unsigned char c = '\0';
@@ -47517,26 +43919,23 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
 
-printf "%s\n" "#define HAVE_IMAP_MUTF7 1" >>confdefs.h
+$as_echo "#define HAVE_IMAP_MUTF7 1" >>confdefs.h
 
         ac_cv_utf8_to_mutf7=yes
 
-else case e in #(
-  e)
+else
+
         ac_cv_utf8_to_mutf7=no
-       ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-     ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_utf8_to_mutf7" >&5
-printf "%s\n" "$ac_cv_utf8_to_mutf7" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_utf8_to_mutf7" >&5
+$as_echo "$ac_cv_utf8_to_mutf7" >&6; }
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -47545,8 +43944,8 @@
 
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether rfc822_output_address_list function present" >&5
-printf %s "checking whether rfc822_output_address_list function present... " >&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="
@@ -47588,34 +43987,32 @@
     }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     LIBS=$old_LIBS
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_RFC822_OUTPUT_ADDRESS_LIST 1" >>confdefs.h
+$as_echo "#define HAVE_RFC822_OUTPUT_ADDRESS_LIST 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LIBS=$old_LIBS
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 
-   ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether build with IMAP works" >&5
-printf %s "checking whether build with IMAP works... " >&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
@@ -47654,27 +44051,25 @@
     }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     LIBS=$old_LIBS
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
 
+else
 
-else case e in #(
-  e)
     LIBS=$old_LIBS
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       as_fn_error $? "build test failed. Please check the config.log for details." "$LINENO" 5
 
-   ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
 
@@ -47686,18 +44081,16 @@
 
 php_enable_intl=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable internationalization support" >&5
-printf %s "checking whether to enable internationalization support... " >&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+y}
-then :
+if test "${enable_intl+set}" = set; then :
   enableval=$enable_intl; PHP_INTL=$enableval
-else case e in #(
-  e)
+else
+
   PHP_INTL=no
   test "$PHP_ENABLE_ALL" && PHP_INTL=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -47723,8 +44116,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -47733,17 +44126,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for icu-uc >= 50.1 icu-io icu-i18n" >&5
-printf %s "checking for icu-uc >= 50.1 icu-io icu-i18n... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for icu-uc >= 50.1 icu-io icu-i18n" >&5
+$as_echo_n "checking for icu-uc >= 50.1 icu-io icu-i18n... " >&6; }
 
 if test -n "$ICU_CFLAGS"; then
     pkg_cv_ICU_CFLAGS="$ICU_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc >= 50.1 icu-io icu-i18n\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc >= 50.1 icu-io icu-i18n\""; } >&5
   ($PKG_CONFIG --exists --print-errors "icu-uc >= 50.1 icu-io icu-i18n") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ICU_CFLAGS=`$PKG_CONFIG --cflags "icu-uc >= 50.1 icu-io icu-i18n" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -47757,10 +44150,10 @@
     pkg_cv_ICU_LIBS="$ICU_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc >= 50.1 icu-io icu-i18n\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"icu-uc >= 50.1 icu-io icu-i18n\""; } >&5
   ($PKG_CONFIG --exists --print-errors "icu-uc >= 50.1 icu-io icu-i18n") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ICU_LIBS=`$PKG_CONFIG --libs "icu-uc >= 50.1 icu-io icu-i18n" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -47774,8 +44167,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -47801,10 +44194,10 @@
 and ICU_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -47814,12 +44207,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	ICU_CFLAGS=$pkg_cv_ICU_CFLAGS
 	ICU_LIBS=$pkg_cv_ICU_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -47966,8 +44359,7 @@
   ICU_CFLAGS="$ICU_CFLAGS -DU_NO_DEFAULT_INCLUDE_UTF_HEADERS=1"
   ICU_CXXFLAGS="$ICU_CXXFLAGS -DUNISTR_FROM_CHAR_EXPLICIT=explicit -DUNISTR_FROM_STRING_EXPLICIT=explicit"
 
-  if $PKG_CONFIG icu-io --atleast-version=60
-then :
+  if $PKG_CONFIG icu-io --atleast-version=60; then :
   ICU_CFLAGS="$ICU_CFLAGS -DU_HIDE_OBSOLETE_UTF_OLD_H=1"
 fi
 
@@ -48205,7 +44597,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_INTL 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_INTL 1
+_ACEOF
 
     fi
   fi
@@ -48457,48 +44851,42 @@
     CXX=$CCC
   else
     if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_CXX+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$CXX"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$CXX"; then
   ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-printf "%s\n" "$CXX" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -48507,48 +44895,42 @@
 fi
 if test -z "$CXX"; then
   ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_CXX+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_CXX"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-printf "%s\n" "$ac_ct_CXX" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -48560,8 +44942,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     CXX=$ac_ct_CXX
@@ -48571,7 +44953,7 @@
   fi
 fi
 # Provide some information about the compiler.
-printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -48581,7 +44963,7 @@
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-printf "%s\n" "$ac_try_echo"; } >&5
+$as_echo "$ac_try_echo"; } >&5
   (eval "$ac_compiler $ac_option >&5") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
@@ -48591,21 +44973,20 @@
     cat conftest.er1 >&5
   fi
   rm -f conftest.er1 conftest.err
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
 done
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5
-printf %s "checking whether the compiler supports GNU C++... " >&6; }
-if test ${ac_cv_cxx_compiler_gnu+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 #ifndef __GNUC__
        choke me
@@ -48615,36 +44996,30 @@
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_compiler_gnu=yes
-else case e in #(
-  e) ac_compiler_gnu=no ;;
-esac
+else
+  ac_compiler_gnu=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
- ;;
-esac
-fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; }
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
+fi
+{ $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+y}
+ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-printf %s "checking whether $CXX accepts -g... " >&6; }
-if test ${ac_cv_prog_cxx_g+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+if ${ac_cv_prog_cxx_g+:} false; 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"
@@ -48652,63 +45027,57 @@
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
-else case e in #(
-  e) CXXFLAGS=""
+else
+  CXXFLAGS=""
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
 
-else case e in #(
-  e) ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+else
+  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
   ac_cv_prog_cxx_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-printf "%s\n" "$ac_cv_prog_cxx_g" >&6; }
-if test $ac_test_CXXFLAGS; then
+{ $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
   if test "$GXX" = yes; then
@@ -48723,106 +45092,6 @@
     CXXFLAGS=
   fi
 fi
-ac_prog_cxx_stdcxx=no
-if test x$ac_prog_cxx_stdcxx = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
-printf %s "checking for $CXX option to enable C++11 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx11+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cxx_cxx11=no
-ac_save_CXX=$CXX
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_cxx_conftest_cxx11_program
-_ACEOF
-for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA
-do
-  CXX="$ac_save_CXX $ac_arg"
-  if ac_fn_cxx_try_compile "$LINENO"
-then :
-  ac_cv_prog_cxx_cxx11=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cxx_cxx11" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CXX=$ac_save_CXX ;;
-esac
-fi
-
-if test "x$ac_cv_prog_cxx_cxx11" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cxx_cxx11" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5
-printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; }
-     CXX="$CXX $ac_cv_prog_cxx_cxx11" ;;
-esac
-fi
-  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11
-  ac_prog_cxx_stdcxx=cxx11 ;;
-esac
-fi
-fi
-if test x$ac_prog_cxx_stdcxx = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
-printf %s "checking for $CXX option to enable C++98 features... " >&6; }
-if test ${ac_cv_prog_cxx_cxx98+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_prog_cxx_cxx98=no
-ac_save_CXX=$CXX
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-$ac_cxx_conftest_cxx98_program
-_ACEOF
-for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA
-do
-  CXX="$ac_save_CXX $ac_arg"
-  if ac_fn_cxx_try_compile "$LINENO"
-then :
-  ac_cv_prog_cxx_cxx98=$ac_arg
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam
-  test "x$ac_cv_prog_cxx_cxx98" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CXX=$ac_save_CXX ;;
-esac
-fi
-
-if test "x$ac_cv_prog_cxx_cxx98" = xno
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-printf "%s\n" "unsupported" >&6; }
-else case e in #(
-  e) if test "x$ac_cv_prog_cxx_cxx98" = x
-then :
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-printf "%s\n" "none needed" >&6; }
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5
-printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; }
-     CXX="$CXX $ac_cv_prog_cxx_cxx98" ;;
-esac
-fi
-  ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98
-  ac_prog_cxx_stdcxx=cxx98 ;;
-esac
-fi
-fi
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -48834,35 +45103,38 @@
 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
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-printf %s "checking how to run the C++ preprocessor... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
-  if test ${ac_cv_prog_CXXCPP+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)     # Double quotes because $CXX needs to be expanded
-    for CXXCPP in "$CXX -E" cpp /lib/cpp
+  if ${ac_cv_prog_CXXCPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
     do
       ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <limits.h>
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
-else case e in #(
-  e) # Broken: fails on valid input.
-continue ;;
-esac
+else
+  # Broken: fails on valid input.
+continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -48872,56 +45144,56 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
-else case e in #(
-  e) # Passes both tests.
+else
+  # Passes both tests.
 ac_preproc_ok=:
-break ;;
-esac
+break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
+if $ac_preproc_ok; then :
   break
 fi
 
     done
     ac_cv_prog_CXXCPP=$CXXCPP
-   ;;
-esac
+
 fi
   CXXCPP=$ac_cv_prog_CXXCPP
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-printf "%s\n" "$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
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <limits.h>
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
-else case e in #(
-  e) # Broken: fails on valid input.
-continue ;;
-esac
+else
+  # Broken: fails on valid input.
+continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -48931,30 +45203,26 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
-else case e in #(
-  e) # Passes both tests.
+else
+  # Passes both tests.
 ac_preproc_ok=:
-break ;;
-esac
+break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
+if $ac_preproc_ok; then :
 
-else case e in #(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See 'config.log' for more details" "$LINENO" 5; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -48977,14 +45245,13 @@
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if intl requires -std=gnu++17" >&5
-printf %s "checking if intl requires -std=gnu++17... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if intl requires -std=gnu++17" >&5
+$as_echo_n "checking if intl requires -std=gnu++17... " >&6; }
 
-if $PKG_CONFIG icu-uc --atleast-version=74
-then :
+if $PKG_CONFIG icu-uc --atleast-version=74; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       ax_cxx_compile_alternatives="17 1z"  ax_cxx_compile_cxx17_required=true  ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -48994,14 +45261,13 @@
 
         for alternative in ${ax_cxx_compile_alternatives}; do
     for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
-      cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx17_$switch" | sed "$as_sed_sh"`
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features with $switch" >&5
-printf %s "checking whether $CXX supports C++17 features with $switch... " >&6; }
-if eval test \${$cachevar+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_save_CXX="$CXX"
+      cachevar=`$as_echo "ax_cv_cxx_compile_cxx17_$switch" | $as_tr_sh`
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++17 features with $switch" >&5
+$as_echo_n "checking whether $CXX supports C++17 features with $switch... " >&6; }
+if eval \${$cachevar+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_CXX="$CXX"
            CXX="$CXX $switch"
            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -49792,20 +46058,17 @@
 
 
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
   eval $cachevar=yes
-else case e in #(
-  e) eval $cachevar=no ;;
-esac
+else
+  eval $cachevar=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           CXX="$ac_save_CXX" ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+           CXX="$ac_save_CXX"
 fi
 eval ac_res=\$$cachevar
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
       if eval test x\$$cachevar = xyes; then
         eval PHP_INTL_STDCXX="$switch"
         ac_success=yes
@@ -49829,16 +46092,16 @@
     fi
   fi
   if test x$ac_success = xno; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: No compiler with C++17 support was found" >&5
-printf "%s\n" "$as_me: No compiler with C++17 support was found" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++17 support was found" >&5
+$as_echo "$as_me: No compiler with C++17 support was found" >&6;}
   fi
 
 
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       ax_cxx_compile_alternatives="11 0x"  ax_cxx_compile_cxx11_required=true  ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -49848,14 +46111,13 @@
 
         for alternative in ${ax_cxx_compile_alternatives}; do
     for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
-      cachevar=`printf "%s\n" "ax_cv_cxx_compile_cxx11_$switch" | sed "$as_sed_sh"`
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5
-printf %s "checking whether $CXX supports C++11 features with $switch... " >&6; }
-if eval test \${$cachevar+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_save_CXX="$CXX"
+      cachevar=`$as_echo "ax_cv_cxx_compile_cxx11_$switch" | $as_tr_sh`
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports C++11 features with $switch" >&5
+$as_echo_n "checking whether $CXX supports C++11 features with $switch... " >&6; }
+if eval \${$cachevar+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_save_CXX="$CXX"
            CXX="$CXX $switch"
            cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -50148,20 +46410,17 @@
 
 
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"
-then :
+if ac_fn_cxx_try_compile "$LINENO"; then :
   eval $cachevar=yes
-else case e in #(
-  e) eval $cachevar=no ;;
-esac
+else
+  eval $cachevar=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-           CXX="$ac_save_CXX" ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+           CXX="$ac_save_CXX"
 fi
 eval ac_res=\$$cachevar
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
       if eval test x\$$cachevar = xyes; then
         eval PHP_INTL_STDCXX="$switch"
         ac_success=yes
@@ -50185,13 +46444,12 @@
     fi
   fi
   if test x$ac_success = xno; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5
-printf "%s\n" "$as_me: No compiler with C++11 support was found" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: No compiler with C++11 support was found" >&5
+$as_echo "$as_me: No compiler with C++11 support was found" >&6;}
   fi
 
 
-   ;;
-esac
+
 fi
 
   PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $PHP_INTL_STDCXX $ICU_CXXFLAGS"
@@ -50383,7 +46641,7 @@
 
 
 
-printf "%s\n" "#define HAVE_JSON 1 " >>confdefs.h
+$as_echo "#define HAVE_JSON 1 " >>confdefs.h
 
 
   ext_builddir=ext/json
@@ -50525,7 +46783,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_JSON 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_JSON 1
+_ACEOF
 
     fi
   fi
@@ -50687,19 +46947,17 @@
 
 php_with_ldap=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LDAP support" >&5
-printf %s "checking for LDAP support... " >&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+y}
-then :
+if test "${with_ldap+set}" = set; then :
   withval=$with_ldap; PHP_LDAP=$withval
-else case e in #(
-  e)
+else
+
   PHP_LDAP=no
   test "$PHP_ENABLE_ALL" && PHP_LDAP=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -50725,8 +46983,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -50734,25 +46992,23 @@
 
 php_with_ldap_sasl=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with LDAP Cyrus SASL support" >&5
-printf %s "checking whether to build with LDAP Cyrus SASL support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with LDAP Cyrus SASL support" >&5
+$as_echo_n "checking whether to build with LDAP Cyrus SASL support... " >&6; }
 
 # Check whether --with-ldap-sasl was given.
-if test ${with_ldap_sasl+y}
-then :
+if test "${with_ldap_sasl+set}" = set; then :
   withval=$with_ldap_sasl; PHP_LDAP_SASL=$withval
-else case e in #(
-  e)
+else
+
   PHP_LDAP_SASL=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_LDAP_SASL
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -50893,7 +47149,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_LDAP 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_LDAP 1
+_ACEOF
 
     fi
   fi
@@ -51030,55 +47288,51 @@
 
             # 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]];'.
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-printf %s "checking size of long... " >&6; }
-if test ${ac_cv_sizeof_long+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_long" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if ${ac_cv_sizeof_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-printf "%s\n" "$ac_cv_sizeof_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
-printf %s "checking if we're at 64-bit platform... " >&6; }
-    if test "$ac_cv_sizeof_long" -eq 4
-then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
+$as_echo_n "checking if we're at 64-bit platform... " >&6; }
+    if test "$ac_cv_sizeof_long" -eq 4; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       PHP_OCI8_IC_LIBDIR_SUFFIX=""
 
-else case e in #(
-  e)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       PHP_OCI8_IC_LIBDIR_SUFFIX=64
-     ;;
-esac
+
 fi
 
     OCISDKRPMINC=`echo "$i" | $SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${PHP_OCI8_IC_LIBDIR_SUFFIX}'\)*/lib/*$!/usr/include/oracle/\1/client\2!'`
@@ -51109,55 +47363,51 @@
 
             # 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]];'.
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-printf %s "checking size of long... " >&6; }
-if test ${ac_cv_sizeof_long+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_long" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if ${ac_cv_sizeof_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-printf "%s\n" "$ac_cv_sizeof_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
-printf %s "checking if we're at 64-bit platform... " >&6; }
-    if test "$ac_cv_sizeof_long" -eq 4
-then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
+$as_echo_n "checking if we're at 64-bit platform... " >&6; }
+    if test "$ac_cv_sizeof_long" -eq 4; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       PHP_OCI8_IC_LIBDIR_SUFFIX=""
 
-else case e in #(
-  e)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       PHP_OCI8_IC_LIBDIR_SUFFIX=64
-     ;;
-esac
+
 fi
 
     OCISDKRPMINC=`echo "$PHP_LDAP" | $SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${PHP_OCI8_IC_LIBDIR_SUFFIX}'\)*/lib/*$!/usr/include/oracle/\1/client\2!'`
@@ -51575,7 +47825,7 @@
 
 
 
-printf "%s\n" "#define HAVE_ORALDAP 1" >>confdefs.h
+$as_echo "#define HAVE_ORALDAP 1" >>confdefs.h
 
 
   elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME.11.1 || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then
@@ -51677,7 +47927,7 @@
 
 
 
-printf "%s\n" "#define HAVE_ORALDAP 1" >>confdefs.h
+$as_echo "#define HAVE_ORALDAP 1" >>confdefs.h
 
 
   elif test -f $LDAP_LIBDIR/libclntsh.$SHLIB_SUFFIX_NAME || test -f $LDAP_LIBDIR/$MACHINE_INCLUDES/libclntsh.$SHLIB_SUFFIX_NAME; then
@@ -51779,7 +48029,7 @@
 
 
 
-printf "%s\n" "#define HAVE_ORALDAP 1" >>confdefs.h
+$as_echo "#define HAVE_ORALDAP 1" >>confdefs.h
 
 
   else
@@ -51821,7 +48071,7 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST LDAP_SHARED_LIBADD"
 
 
-printf "%s\n" "#define HAVE_LDAP 1" >>confdefs.h
+$as_echo "#define HAVE_LDAP 1" >>confdefs.h
 
 
     _SAVE_CPPFLAGS=$CPPFLAGS
@@ -51829,117 +48079,64 @@
   CPPFLAGS="$CPPFLAGS -I$LDAP_INCDIR"
   LIBS="$LIBS $LDAP_SHARED_LIBADD"
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for 3 arg ldap_set_rebind_proc" >&5
-printf %s "checking for 3 arg ldap_set_rebind_proc... " >&6; }
-if test ${ac_cv_3arg_setrebindproc+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    { $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 ${ac_cv_3arg_setrebindproc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <ldap.h>
 int
-main (void)
+main ()
 {
 ldap_set_rebind_proc(0,0,0)
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_3arg_setrebindproc=yes
-else case e in #(
-  e) ac_cv_3arg_setrebindproc=no ;;
-esac
+else
+  ac_cv_3arg_setrebindproc=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_3arg_setrebindproc" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_3ARG_SETREBINDPROC 1" >>confdefs.h
+$as_echo "#define HAVE_3ARG_SETREBINDPROC 1" >>confdefs.h
 
   fi
 
-      ac_fn_c_check_func "$LINENO" "ldap_parse_result" "ac_cv_func_ldap_parse_result"
-if test "x$ac_cv_func_ldap_parse_result" = xyes
-then :
-  printf "%s\n" "#define HAVE_LDAP_PARSE_RESULT 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ldap_parse_reference" "ac_cv_func_ldap_parse_reference"
-if test "x$ac_cv_func_ldap_parse_reference" = xyes
-then :
-  printf "%s\n" "#define HAVE_LDAP_PARSE_REFERENCE 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ldap_start_tls_s" "ac_cv_func_ldap_start_tls_s"
-if test "x$ac_cv_func_ldap_start_tls_s" = xyes
-then :
-  printf "%s\n" "#define HAVE_LDAP_START_TLS_S 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ldap_control_find" "ac_cv_func_ldap_control_find"
-if test "x$ac_cv_func_ldap_control_find" = xyes
-then :
-  printf "%s\n" "#define HAVE_LDAP_CONTROL_FIND 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ldap_parse_extended_result" "ac_cv_func_ldap_parse_extended_result"
-if test "x$ac_cv_func_ldap_parse_extended_result" = xyes
-then :
-  printf "%s\n" "#define HAVE_LDAP_PARSE_EXTENDED_RESULT 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ldap_extended_operation" "ac_cv_func_ldap_extended_operation"
-if test "x$ac_cv_func_ldap_extended_operation" = xyes
-then :
-  printf "%s\n" "#define HAVE_LDAP_EXTENDED_OPERATION 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ldap_extended_operation_s" "ac_cv_func_ldap_extended_operation_s"
-if test "x$ac_cv_func_ldap_extended_operation_s" = xyes
-then :
-  printf "%s\n" "#define HAVE_LDAP_EXTENDED_OPERATION_S 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ldap_passwd" "ac_cv_func_ldap_passwd"
-if test "x$ac_cv_func_ldap_passwd" = xyes
-then :
-  printf "%s\n" "#define HAVE_LDAP_PASSWD 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ldap_whoami_s" "ac_cv_func_ldap_whoami_s"
-if test "x$ac_cv_func_ldap_whoami_s" = xyes
-then :
-  printf "%s\n" "#define HAVE_LDAP_WHOAMI_S 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ldap_refresh_s" "ac_cv_func_ldap_refresh_s"
-if test "x$ac_cv_func_ldap_refresh_s" = xyes
-then :
-  printf "%s\n" "#define HAVE_LDAP_REFRESH_S 1" >>confdefs.h
+      for ac_func in ldap_parse_result ldap_parse_reference ldap_start_tls_s ldap_control_find ldap_parse_extended_result ldap_extended_operation ldap_extended_operation_s ldap_passwd ldap_whoami_s ldap_refresh_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"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
+done
 
 
     if test "$PHP_LDAP_SASL" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsasl2" >&5
-printf %s "checking for libsasl2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsasl2" >&5
+$as_echo_n "checking for libsasl2... " >&6; }
 
 if test -n "$SASL_CFLAGS"; then
     pkg_cv_SASL_CFLAGS="$SASL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsasl2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsasl2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsasl2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SASL_CFLAGS=`$PKG_CONFIG --cflags "libsasl2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -51953,10 +48150,10 @@
     pkg_cv_SASL_LIBS="$SASL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsasl2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsasl2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsasl2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SASL_LIBS=`$PKG_CONFIG --libs "libsasl2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -51970,8 +48167,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -51997,10 +48194,10 @@
 and SASL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -52010,12 +48207,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	SASL_CFLAGS=$pkg_cv_SASL_CFLAGS
 	SASL_LIBS=$pkg_cv_SASL_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -52160,19 +48357,17 @@
 
 
 
-printf "%s\n" "#define HAVE_LDAP_SASL 1" >>confdefs.h
+$as_echo "#define HAVE_LDAP_SASL 1" >>confdefs.h
 
   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" = xyes
-then :
+if test "x$ac_cv_func_ldap_bind_s" = xyes; then :
+
+else
 
-else case e in #(
-  e)
     as_fn_error $? "LDAP build check failed. Please check config.log for more information." "$LINENO" 5
-   ;;
-esac
+
 fi
 
 
@@ -52205,18 +48400,16 @@
 
 php_enable_mbstring=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable multibyte string support" >&5
-printf %s "checking whether to enable multibyte string support... " >&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+y}
-then :
+if test "${enable_mbstring+set}" = set; then :
   enableval=$enable_mbstring; PHP_MBSTRING=$enableval
-else case e in #(
-  e)
+else
+
   PHP_MBSTRING=no
   test "$PHP_ENABLE_ALL" && PHP_MBSTRING=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -52242,8 +48435,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -52251,31 +48444,29 @@
 
 php_enable_mbregex=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable multibyte regex support (requires oniguruma)" >&5
-printf %s "checking whether to enable multibyte regex support (requires oniguruma)... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable multibyte regex support (requires oniguruma)" >&5
+$as_echo_n "checking whether to enable multibyte regex support (requires oniguruma)... " >&6; }
 # Check whether --enable-mbregex was given.
-if test ${enable_mbregex+y}
-then :
+if test "${enable_mbregex+set}" = set; then :
   enableval=$enable_mbregex; PHP_MBREGEX=$enableval
-else case e in #(
-  e)
+else
+
   PHP_MBREGEX=yes
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_MBREGEX
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_MBSTRING 1" >>confdefs.h
+$as_echo "#define HAVE_MBSTRING 1" >>confdefs.h
 
 
 
@@ -52287,17 +48478,17 @@
   if test "$PHP_MBREGEX" = "yes"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for oniguruma" >&5
-printf %s "checking for oniguruma... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for oniguruma" >&5
+$as_echo_n "checking for oniguruma... " >&6; }
 
 if test -n "$ONIG_CFLAGS"; then
     pkg_cv_ONIG_CFLAGS="$ONIG_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"oniguruma\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"oniguruma\""; } >&5
   ($PKG_CONFIG --exists --print-errors "oniguruma") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ONIG_CFLAGS=`$PKG_CONFIG --cflags "oniguruma" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -52311,10 +48502,10 @@
     pkg_cv_ONIG_LIBS="$ONIG_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"oniguruma\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"oniguruma\""; } >&5
   ($PKG_CONFIG --exists --print-errors "oniguruma") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ONIG_LIBS=`$PKG_CONFIG --libs "oniguruma" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -52328,8 +48519,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -52355,10 +48546,10 @@
 and ONIG_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -52368,12 +48559,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	ONIG_CFLAGS=$pkg_cv_ONIG_CFLAGS
 	ONIG_LIBS=$pkg_cv_ONIG_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -52616,15 +48807,15 @@
     esac
   done
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if oniguruma has an invalid entry for KOI8 encoding" >&5
-printf %s "checking if oniguruma has an invalid entry for KOI8 encoding... " >&6; }
+    { $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>
 
 int
-main (void)
+main ()
 {
 
 return (int)(ONIG_ENCODING_KOI8 + 1);
@@ -52633,23 +48824,21 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
-else case e in #(
-  e)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define PHP_ONIG_BAD_KOI8_ENTRY 1" >>confdefs.h
 
-printf "%s\n" "#define PHP_ONIG_BAD_KOI8_ENTRY 1" >>confdefs.h
 
-     ;;
-esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     LDFLAGS=$save_old_LDFLAGS
 
@@ -52661,7 +48850,7 @@
 
 
 
-printf "%s\n" "#define HAVE_MBREGEX 1" >>confdefs.h
+$as_echo "#define HAVE_MBREGEX 1" >>confdefs.h
 
 
 
@@ -52894,7 +49083,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_MBSTRING 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_MBSTRING 1
+_ACEOF
 
     fi
   fi
@@ -53136,19 +49327,17 @@
 
 php_with_mysqli=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MySQLi support" >&5
-printf %s "checking for MySQLi support... " >&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+y}
-then :
+if test "${with_mysqli+set}" = set; then :
   withval=$with_mysqli; PHP_MYSQLI=$withval
-else case e in #(
-  e)
+else
+
   PHP_MYSQLI=no
   test "$PHP_ENABLE_ALL" && PHP_MYSQLI=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -53174,8 +49363,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -53183,25 +49372,23 @@
 
 php_with_mysql_sock=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for specified location of the MySQL UNIX socket" >&5
-printf %s "checking for specified location of the MySQL UNIX socket... " >&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+y}
-then :
+if test "${with_mysql_sock+set}" = set; then :
   withval=$with_mysql_sock; PHP_MYSQL_SOCK=$withval
-else case e in #(
-  e)
+else
+
   PHP_MYSQL_SOCK=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_MYSQL_SOCK
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -53214,15 +49401,17 @@
 fi
 
 if test "$PHP_MYSQLI" != "no"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MySQL UNIX socket location" >&5
-printf %s "checking for MySQL UNIX socket location... " >&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
 
-printf "%s\n" "#define PHP_MYSQL_UNIX_SOCK_ADDR \"$MYSQL_SOCK\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK"
+_ACEOF
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
-printf "%s\n" "$MYSQL_SOCK" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
+$as_echo "$MYSQL_SOCK" >&6; }
   elif test "$PHP_MYSQL_SOCK" = "yes"; then
 
   for i in  \
@@ -53244,18 +49433,20 @@
 
   if test -n "$MYSQL_SOCK"; then
 
-printf "%s\n" "#define PHP_MYSQL_UNIX_SOCK_ADDR \"$MYSQL_SOCK\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK"
+_ACEOF
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
-printf "%s\n" "$MYSQL_SOCK" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
+$as_echo "$MYSQL_SOCK" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
   mysqli_sources="mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \
@@ -53395,7 +49586,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_MYSQLI 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_MYSQLI 1
+_ACEOF
 
     fi
   fi
@@ -53606,19 +49799,17 @@
 
 php_with_oci8=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Oracle Database OCI8 support" >&5
-printf %s "checking for Oracle Database OCI8 support... " >&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+y}
-then :
+if test "${with_oci8+set}" = set; then :
   withval=$with_oci8; PHP_OCI8=$withval
-else case e in #(
-  e)
+else
+
   PHP_OCI8=no
   test "$PHP_ENABLE_ALL" && PHP_OCI8=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -53644,8 +49835,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -53656,8 +49847,8 @@
             as_fn_error $? "Empty parameter value passed to --with-oci8" "$LINENO" 5
   fi
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking PHP version" >&5
-printf %s "checking PHP version... " >&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
@@ -53688,25 +49879,26 @@
   elif test "$oci8_php_version" -lt "8001000"; then
     as_fn_error $? "You need at least PHP 8.1.0 to be able to use this version of OCI8. Use OCI8 3.0 for PHP $php_version" "$LINENO" 5
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_version, ok" >&5
-printf "%s\n" "$php_version, ok" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_version, ok" >&5
+$as_echo "$php_version, ok" >&6; }
   fi
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking OCI8 DTrace support" >&5
-printf %s "checking OCI8 DTrace support... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking OCI8 DTrace support" >&5
+$as_echo_n "checking OCI8 DTrace support... " >&6; }
   oci8_do_dtrace="`echo $PHP_OCI8 | cut -d, -f3`"
   if test "$PHP_DTRACE" = "yes" -o "$oci8_do_dtrace" = "dtrace" ; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     if test "$ext_shared" = "no"; then
       as_fn_error $? "For DTrace support OCI8 must be configured as a shared extension" "$LINENO" 5
     else
-             for ac_header in sys/sdt.h
+      for ac_header in sys/sdt.h
 do :
-  ac_fn_c_check_header_compile "$LINENO" "sys/sdt.h" "ac_cv_header_sys_sdt_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sdt_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_SDT_H 1" >>confdefs.h
+  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" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_SDT_H 1
+_ACEOF
 
 
   ac_srcdir=$abs_srcdir/ext/oci8/
@@ -53769,8 +49961,8 @@
 EOF
     ;;
   *)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: OCI8 extension: OCI8 DTrace support is not confirmed on this platform" >&5
-printf "%s\n" "$as_me: WARNING: OCI8 extension: OCI8 DTrace support is not confirmed on this platform" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: OCI8 extension: OCI8 DTrace support is not confirmed on this platform" >&5
+$as_echo "$as_me: WARNING: OCI8 extension: OCI8 DTrace support is not confirmed on this platform" >&2;}
 cat>>Makefile.objects<<EOF
 $ac_bdir$ac_provsrc.o: \$(OCI8_DTRACE_OBJS)
 	CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$@ -s $ac_srcdir$ac_provsrc $dtrace_oci8_objs
@@ -53781,88 +49973,84 @@
 
 
 
-else case e in #(
-  e)
+else
+
 	 as_fn_error $? "Cannot find sys/sdt.h which is required for DTrace support" "$LINENO" 5
-        ;;
-esac
+
 fi
 
 done
 
+
   PHP_VAR_SUBST="$PHP_VAR_SUBST OCI8_DTRACE_OBJS"
 
 
-printf "%s\n" "#define HAVE_OCI8_DTRACE 1" >>confdefs.h
+$as_echo "#define HAVE_OCI8_DTRACE 1" >>confdefs.h
 
                   shared_objects_oci8="$shared_objects_oci8 ext/oci8/oci8_dtrace.d.lo"
     fi
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
     # 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]];'.
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-printf %s "checking size of long... " >&6; }
-if test ${ac_cv_sizeof_long+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_long" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if ${ac_cv_sizeof_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-printf "%s\n" "$ac_cv_sizeof_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
-printf %s "checking if we're at 64-bit platform... " >&6; }
-  if test "$ac_cv_sizeof_long" -eq 4
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
+$as_echo_n "checking if we're at 64-bit platform... " >&6; }
+  if test "$ac_cv_sizeof_long" -eq 4; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     PHP_OCI8_OH_LIBDIR=lib32
     PHP_OCI8_IC_LIBDIR_SUFFIX=""
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     PHP_OCI8_OH_LIBDIR=lib
     PHP_OCI8_IC_LIBDIR_SUFFIX=64
-   ;;
-esac
+
 fi
 
 
   PHP_OCI8_INSTANT_CLIENT="no"
 
             if test "$PHP_OCI8" = "yes" && test -z "$ORACLE_HOME"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: OCI8 extension: ORACLE_HOME is not set, looking for default Oracle Instant Client instead" >&5
-printf "%s\n" "$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
 
@@ -53890,20 +50078,20 @@
 
   if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle ORACLE_HOME install directory" >&5
-printf %s "checking Oracle ORACLE_HOME install directory... " >&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
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCI8_DIR" >&5
-printf "%s\n" "$OCI8_DIR" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCI8_DIR" >&5
+$as_echo "$OCI8_DIR" >&6; }
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking ORACLE_HOME library validity" >&5
-printf %s "checking ORACLE_HOME library validity... " >&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
     as_fn_error $? "${OCI8_DIR} is not a directory" "$LINENO" 5
   fi
@@ -53920,8 +50108,8 @@
       as_fn_error $? "Oracle library directory not found in ${OCI8_DIR}" "$LINENO" 5
     fi
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCI8_LIB_DIR" >&5
-printf "%s\n" "$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
@@ -54264,8 +50452,8 @@
     fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle library version compatibility" >&5
-printf %s "checking Oracle library version compatibility... " >&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`
   if test -s "$OCI8_DIR/orainst/unix.rgs"; then
@@ -54288,8 +50476,8 @@
   else
     as_fn_error $? "Oracle libclntsh.$SHLIB_SUFFIX_NAME client library not found" "$LINENO" 5
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCI8_ORACLE_VERSION" >&5
-printf "%s\n" "$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
@@ -54493,7 +50681,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_OCI8 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_OCI8 1
+_ACEOF
 
     fi
   fi
@@ -54615,7 +50805,7 @@
   fi
 
 
-printf "%s\n" "#define HAVE_OCI8 1" >>confdefs.h
+$as_echo "#define HAVE_OCI8 1" >>confdefs.h
 
 
 
@@ -54638,16 +50828,20 @@
 
 
 
-printf "%s\n" "#define PHP_OCI8_DEF_DIR \"$OCI8_DIR\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_OCI8_DEF_DIR "$OCI8_DIR"
+_ACEOF
 
 
-printf "%s\n" "#define PHP_OCI8_DEF_SHARED_LIBADD \"$OCI8_SHARED_LIBADD\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_OCI8_DEF_SHARED_LIBADD "$OCI8_SHARED_LIBADD"
+_ACEOF
 
 
   else
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle Instant Client directory" >&5
-printf %s "checking Oracle Instant Client directory... " >&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[^/]*##'`
@@ -54655,13 +50849,13 @@
 	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
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_OCI8_INSTANT_CLIENT" >&5
-printf "%s\n" "$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
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle Instant Client SDK header directory" >&5
-printf %s "checking Oracle Instant Client SDK header directory... " >&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!'`
 
@@ -54670,8 +50864,8 @@
         OCISDKMANINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!\(.*\)/lib/*$!\1/include!'`
 
     if test -f "$OCISDKRPMINC/oci.h"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCISDKRPMINC" >&5
-printf "%s\n" "$OCISDKRPMINC" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKRPMINC" >&5
+$as_echo "$OCISDKRPMINC" >&6; }
 
   if test "$OCISDKRPMINC" != "/usr/include"; then
 
@@ -54705,8 +50899,8 @@
 
       OCI8INCDIR=$OCISDKRPMINC
     elif test -f "$OCISDKZIPINC/oci.h"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCISDKZIPINC" >&5
-printf "%s\n" "$OCISDKZIPINC" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKZIPINC" >&5
+$as_echo "$OCISDKZIPINC" >&6; }
 
   if test "$OCISDKZIPINC" != "/usr/include"; then
 
@@ -54740,8 +50934,8 @@
 
       OCI8INCDIR=$OCISDKZIPINC
     elif test -f "$OCISDKMANINC/oci.h"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCISDKMANINC" >&5
-printf "%s\n" "$OCISDKMANINC" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKMANINC" >&5
+$as_echo "$OCISDKMANINC" >&6; }
 
   if test "$OCISDKMANINC" != "/usr/include"; then
 
@@ -54882,8 +51076,8 @@
     fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle Instant Client library version compatibility" >&5
-printf %s "checking Oracle Instant Client library version compatibility... " >&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`
   OCI8_NNZ=`ls $PHP_OCI8_INSTANT_CLIENT/libnnz*.$SHLIB_SUFFIX_NAME 2> /dev/null | $PHP_OCI8_TAIL1`
@@ -54895,8 +51089,8 @@
   else
     as_fn_error $? "Oracle Instant Client libraries libnnz.$SHLIB_SUFFIX_NAME and libclntsh.$SHLIB_SUFFIX_NAME not found" "$LINENO" 5
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCI8_ORACLE_VERSION" >&5
-printf "%s\n" "$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
       10.1)
@@ -54966,7 +51160,7 @@
 
 
 
-printf "%s\n" "#define HAVE_OCI_INSTANT_CLIENT 1" >>confdefs.h
+$as_echo "#define HAVE_OCI_INSTANT_CLIENT 1" >>confdefs.h
 
 
 
@@ -55103,7 +51297,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_OCI8 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_OCI8 1
+_ACEOF
 
     fi
   fi
@@ -55225,7 +51421,7 @@
   fi
 
 
-printf "%s\n" "#define HAVE_OCI8 1" >>confdefs.h
+$as_echo "#define HAVE_OCI8 1" >>confdefs.h
 
 
 
@@ -55270,15 +51466,13 @@
 
 
 # Check whether --with-odbcver was given.
-if test ${with_odbcver+y}
-then :
+if test "${with_odbcver+set}" = set; then :
   withval=$with_odbcver; PHP_ODBCVER=$withval
-else case e in #(
-  e)
+else
+
   PHP_ODBCVER=0x0350
   test "$PHP_ENABLE_ALL" && PHP_ODBCVER=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -55316,15 +51510,13 @@
 
 
 # Check whether --with-adabas was given.
-if test ${with_adabas+y}
-then :
+if test "${with_adabas+set}" = set; then :
   withval=$with_adabas; PHP_ADABAS=$withval
-else case e in #(
-  e)
+else
+
   PHP_ADABAS=no
   test "$PHP_ENABLE_ALL" && PHP_ADABAS=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -55355,8 +51547,8 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Adabas support" >&5
-printf %s "checking for Adabas support... " >&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" != "no"; then
     if test "$PHP_ADABAS" = "yes"; then
       PHP_ADABAS=/usr/local
@@ -55507,13 +51699,13 @@
 fi
 
 
-printf "%s\n" "#define HAVE_ADABAS 1" >>confdefs.h
+$as_echo "#define HAVE_ADABAS 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -55524,15 +51716,13 @@
 
 
 # Check whether --with-sapdb was given.
-if test ${with_sapdb+y}
-then :
+if test "${with_sapdb+set}" = set; then :
   withval=$with_sapdb; PHP_SAPDB=$withval
-else case e in #(
-  e)
+else
+
   PHP_SAPDB=no
   test "$PHP_ENABLE_ALL" && PHP_SAPDB=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -55563,8 +51753,8 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SAP DB support" >&5
-printf %s "checking for SAP DB support... " >&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" != "no"; then
     if test "$PHP_SAPDB" = "yes"; then
       PHP_SAPDB=/usr/local
@@ -55645,13 +51835,13 @@
 
     ODBC_TYPE=sapdb
 
-printf "%s\n" "#define HAVE_SAPDB 1" >>confdefs.h
+$as_echo "#define HAVE_SAPDB 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -55662,15 +51852,13 @@
 
 
 # Check whether --with-solid was given.
-if test ${with_solid+y}
-then :
+if test "${with_solid+set}" = set; then :
   withval=$with_solid; PHP_SOLID=$withval
-else case e in #(
-  e)
+else
+
   PHP_SOLID=no
   test "$PHP_ENABLE_ALL" && PHP_SOLID=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -55701,8 +51889,8 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Solid support" >&5
-printf %s "checking for Solid support... " >&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" != "no"; then
     if test "$PHP_SOLID" = "yes"; then
       PHP_SOLID=/usr/local/solid
@@ -55713,22 +51901,22 @@
     ODBC_TYPE=solid
     if test -f $ODBC_LIBDIR/soc*35.a; then
 
-printf "%s\n" "#define HAVE_SOLID_35 1" >>confdefs.h
+$as_echo "#define HAVE_SOLID_35 1" >>confdefs.h
 
     elif test -f $ODBC_LIBDIR/scl*30.a; then
 
-printf "%s\n" "#define HAVE_SOLID_30 1" >>confdefs.h
+$as_echo "#define HAVE_SOLID_30 1" >>confdefs.h
 
     elif test -f $ODBC_LIBDIR/scl*23.a; then
 
-printf "%s\n" "#define HAVE_SOLID 1" >>confdefs.h
+$as_echo "#define HAVE_SOLID 1" >>confdefs.h
 
     fi
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Solid library file" >&5
-printf %s "checking Solid library file... " >&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
@@ -55738,12 +51926,12 @@
     Linux)
       if ldd -v /bin/sh | grep GLIBC > /dev/null; then
 
-printf "%s\n" "#define SS_LINUX 1" >>confdefs.h
+$as_echo "#define SS_LINUX 1" >>confdefs.h
 
         ac_solid_os=l2x
       else
 
-printf "%s\n" "#define SS_LINUX 1" >>confdefs.h
+$as_echo "#define SS_LINUX 1" >>confdefs.h
 
         ac_solid_os=lux
       fi;;
@@ -55752,12 +51940,12 @@
     FreeBSD)
       if test `expr $ac_solid_uname_r : '\(.\)'` -gt "2"; then
 
-printf "%s\n" "#define SS_FBX 1" >>confdefs.h
+$as_echo "#define SS_FBX 1" >>confdefs.h
 
         ac_solid_os=fex
       else
 
-printf "%s\n" "#define SS_FBX 1" >>confdefs.h
+$as_echo "#define SS_FBX 1" >>confdefs.h
 
         ac_solid_os=fbx
       fi;;
@@ -55788,12 +51976,12 @@
   ODBC_LIBS=-l${ac_solid_prefix}${ac_solid_os}${ac_solid_version}
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&5
-printf "%s\n" "\`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; }
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -55804,15 +51992,13 @@
 
 
 # Check whether --with-ibm-db2 was given.
-if test ${with_ibm_db2+y}
-then :
+if test "${with_ibm_db2+set}" = set; then :
   withval=$with_ibm_db2; PHP_IBM_DB2=$withval
-else case e in #(
-  e)
+else
+
   PHP_IBM_DB2=no
   test "$PHP_ENABLE_ALL" && PHP_IBM_DB2=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -55843,8 +52029,8 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for IBM DB2 support" >&5
-printf %s "checking for IBM DB2 support... " >&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" != "no"; then
     if test "$PHP_IBM_DB2" = "yes"; then
       ODBC_INCDIR=/home/db2inst1/sqllib/include
@@ -55881,39 +52067,37 @@
     }
 
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
     LIBS=$old_LIBS
 
 
-printf "%s\n" "#define HAVE_IBMDB2 1" >>confdefs.h
+$as_echo "#define HAVE_IBMDB2 1" >>confdefs.h
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
 
+else
 
-else case e in #(
-  e)
     LIBS=$old_LIBS
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       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
 " "$LINENO" 5
 
-   ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -55924,15 +52108,13 @@
 
 
 # Check whether --with-empress was given.
-if test ${with_empress+y}
-then :
+if test "${with_empress+set}" = set; then :
   withval=$with_empress; PHP_EMPRESS=$withval
-else case e in #(
-  e)
+else
+
   PHP_EMPRESS=no
   test "$PHP_ENABLE_ALL" && PHP_EMPRESS=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -55963,8 +52145,8 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Empress support" >&5
-printf %s "checking for Empress support... " >&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" != "no"; then
     if test "$PHP_EMPRESS" = "yes"; then
       ODBC_INCDIR=$EMPRESSPATH/include/odbc
@@ -55977,23 +52159,23 @@
     ODBC_LFLAGS=-L$ODBC_LIBDIR
     ODBC_TYPE=empress
 
-printf "%s\n" "#define HAVE_EMPRESS 1" >>confdefs.h
+$as_echo "#define HAVE_EMPRESS 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Empress library file" >&5
-printf %s "checking Empress library file... " >&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
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \`echo $ODBC_LIBS | sed -e 's!.*/!!'\`" >&5
-printf "%s\n" "\`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; }
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -56004,15 +52186,13 @@
 
 
 # Check whether --with-empress-bcs was given.
-if test ${with_empress_bcs+y}
-then :
+if test "${with_empress_bcs+set}" = set; then :
   withval=$with_empress_bcs; PHP_EMPRESS_BCS=$withval
-else case e in #(
-  e)
+else
+
   PHP_EMPRESS_BCS=no
   test "$PHP_ENABLE_ALL" && PHP_EMPRESS_BCS=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -56043,8 +52223,8 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Empress local access support" >&5
-printf %s "checking for Empress local access support... " >&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" != "no"; then
     if test "$PHP_EMPRESS_BCS" = "yes"; then
       ODBC_INCDIR=$EMPRESSPATH/include/odbc
@@ -56073,23 +52253,23 @@
     ODBC_LIBS="-lempphpbcs -lms -lmscfg -lbasic -lbasic_os -lnlscstab -lnlsmsgtab -lm -ldl -lcrypt"
     ODBC_TYPE=empress-bcs
 
-printf "%s\n" "#define HAVE_EMPRESS 1" >>confdefs.h
+$as_echo "#define HAVE_EMPRESS 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Empress local access library file" >&5
-printf %s "checking Empress local access library file... " >&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
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \`echo $ODBCBCS_LIBS | sed -e 's!.*/!!'\`" >&5
-printf "%s\n" "\`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; }
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -56100,15 +52280,13 @@
 
 
 # Check whether --with-custom-odbc was given.
-if test ${with_custom_odbc+y}
-then :
+if test "${with_custom_odbc+set}" = set; then :
   withval=$with_custom_odbc; PHP_CUSTOM_ODBC=$withval
-else case e in #(
-  e)
+else
+
   PHP_CUSTOM_ODBC=no
   test "$PHP_ENABLE_ALL" && PHP_CUSTOM_ODBC=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -56139,8 +52317,8 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a custom ODBC support" >&5
-printf %s "checking for a custom ODBC support... " >&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" != "no"; then
     if test "$PHP_CUSTOM_ODBC" = "yes"; then
       PHP_CUSTOM_ODBC=/usr/local
@@ -56152,13 +52330,13 @@
     ODBC_LIBS=$CUSTOM_ODBC_LIBS
     ODBC_TYPE=custom-odbc
 
-printf "%s\n" "#define HAVE_CODBC 1" >>confdefs.h
+$as_echo "#define HAVE_CODBC 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -56169,15 +52347,13 @@
 
 
 # Check whether --with-iodbc was given.
-if test ${with_iodbc+y}
-then :
+if test "${with_iodbc+set}" = set; then :
   withval=$with_iodbc; PHP_IODBC=$withval
-else case e in #(
-  e)
+else
+
   PHP_IODBC=no
   test "$PHP_ENABLE_ALL" && PHP_IODBC=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -56208,24 +52384,24 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with iODBC support" >&5
-printf %s "checking whether to build with iODBC support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with iODBC support" >&5
+$as_echo_n "checking whether to build with iODBC support... " >&6; }
   if test "$PHP_IODBC" != "no"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libiodbc" >&5
-printf %s "checking for libiodbc... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiodbc" >&5
+$as_echo_n "checking for libiodbc... " >&6; }
 
 if test -n "$ODBC_CFLAGS"; then
     pkg_cv_ODBC_CFLAGS="$ODBC_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiodbc\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiodbc\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libiodbc") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ODBC_CFLAGS=`$PKG_CONFIG --cflags "libiodbc" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -56239,10 +52415,10 @@
     pkg_cv_ODBC_LIBS="$ODBC_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiodbc\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libiodbc\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libiodbc") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ODBC_LIBS=`$PKG_CONFIG --libs "libiodbc" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -56256,8 +52432,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -56283,10 +52459,10 @@
 and ODBC_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -56296,12 +52472,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	ODBC_CFLAGS=$pkg_cv_ODBC_CFLAGS
 	ODBC_LIBS=$pkg_cv_ODBC_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -56346,14 +52522,14 @@
 
     ODBC_TYPE=iodbc
 
-printf "%s\n" "#define HAVE_IODBC 1" >>confdefs.h
+$as_echo "#define HAVE_IODBC 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_ODBC2 1" >>confdefs.h
+$as_echo "#define HAVE_ODBC2 1" >>confdefs.h
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -56364,15 +52540,13 @@
 
 
 # Check whether --with-esoob was given.
-if test ${with_esoob+y}
-then :
+if test "${with_esoob+set}" = set; then :
   withval=$with_esoob; PHP_ESOOB=$withval
-else case e in #(
-  e)
+else
+
   PHP_ESOOB=no
   test "$PHP_ENABLE_ALL" && PHP_ESOOB=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -56403,8 +52577,8 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Easysoft ODBC-ODBC Bridge support" >&5
-printf %s "checking for Easysoft ODBC-ODBC Bridge support... " >&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" != "no"; then
     if test "$PHP_ESOOB" = "yes"; then
       PHP_ESOOB=/usr/local/easysoft/oob/client
@@ -56416,13 +52590,13 @@
     ODBC_LIBS=-lesoobclient
     ODBC_TYPE=esoob
 
-printf "%s\n" "#define HAVE_ESOOB 1" >>confdefs.h
+$as_echo "#define HAVE_ESOOB 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -56433,15 +52607,13 @@
 
 
 # Check whether --with-unixODBC was given.
-if test ${with_unixODBC+y}
-then :
+if test "${with_unixODBC+set}" = set; then :
   withval=$with_unixODBC; PHP_UNIXODBC=$withval
-else case e in #(
-  e)
+else
+
   PHP_UNIXODBC=no
   test "$PHP_ENABLE_ALL" && PHP_UNIXODBC=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -56472,25 +52644,25 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with unixODBC support" >&5
-printf %s "checking whether to build with unixODBC support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with unixODBC support" >&5
+$as_echo_n "checking whether to build with unixODBC support... " >&6; }
   if test "$PHP_UNIXODBC" != "no"; then
     if test "$PHP_UNIXODBC" = "yes"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes from pkgconfig" >&5
-printf "%s\n" "yes from pkgconfig" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes from pkgconfig" >&5
+$as_echo "yes from pkgconfig" >&6; }
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for odbc" >&5
-printf %s "checking for odbc... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for odbc" >&5
+$as_echo_n "checking for odbc... " >&6; }
 
 if test -n "$ODBC_CFLAGS"; then
     pkg_cv_ODBC_CFLAGS="$ODBC_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"odbc\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"odbc\""; } >&5
   ($PKG_CONFIG --exists --print-errors "odbc") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ODBC_CFLAGS=`$PKG_CONFIG --cflags "odbc" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -56504,10 +52676,10 @@
     pkg_cv_ODBC_LIBS="$ODBC_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"odbc\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"odbc\""; } >&5
   ($PKG_CONFIG --exists --print-errors "odbc") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ODBC_LIBS=`$PKG_CONFIG --libs "odbc" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -56521,8 +52693,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -56548,10 +52720,10 @@
 and ODBC_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -56561,12 +52733,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	ODBC_CFLAGS=$pkg_cv_ODBC_CFLAGS
 	ODBC_LIBS=$pkg_cv_ODBC_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -56620,16 +52792,16 @@
   as_fn_error $? "ODBC header file '$ODBC_INCDIR/sqlext.h' not found!" "$LINENO" 5
 fi
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes in $PHP_UNIXODBC" >&5
-printf "%s\n" "yes in $PHP_UNIXODBC" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes in $PHP_UNIXODBC" >&5
+$as_echo "yes in $PHP_UNIXODBC" >&6; }
     fi
     ODBC_TYPE=unixODBC
 
-printf "%s\n" "#define HAVE_UNIXODBC 1" >>confdefs.h
+$as_echo "#define HAVE_UNIXODBC 1" >>confdefs.h
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
@@ -56640,15 +52812,13 @@
 
 
 # Check whether --with-dbmaker was given.
-if test ${with_dbmaker+y}
-then :
+if test "${with_dbmaker+set}" = set; then :
   withval=$with_dbmaker; PHP_DBMAKER=$withval
-else case e in #(
-  e)
+else
+
   PHP_DBMAKER=no
   test "$PHP_ENABLE_ALL" && PHP_DBMAKER=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -56679,8 +52849,8 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for DBMaker support" >&5
-printf %s "checking for DBMaker support... " >&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" != "no"; then
     if test "$PHP_DBMAKER" = "yes"; then
             DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'`
@@ -56709,17 +52879,17 @@
     ODBC_TYPE=dbmaker
 
 
-printf "%s\n" "#define HAVE_DBMAKER 1" >>confdefs.h
+$as_echo "#define HAVE_DBMAKER 1" >>confdefs.h
 
 
     if test "$ext_shared" = "yes"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (shared)" >&5
-printf "%s\n" "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
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes (static)" >&5
-printf "%s\n" "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
@@ -56803,20 +52973,22 @@
       ODBC_STATIC="libphpext_odbc.la"
     fi
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 fi
 
 if test "no" != "$PHP_ODBCVER"; then
   if test "$PHP_ODBCVER" != "0"; then
 
-printf "%s\n" "#define ODBCVER $PHP_ODBCVER" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define ODBCVER $PHP_ODBCVER
+_ACEOF
 
   fi
 else
 
-printf "%s\n" "#define ODBCVER 0x0300" >>confdefs.h
+$as_echo "#define ODBCVER 0x0300" >>confdefs.h
 
 fi
 
@@ -56923,13 +53095,13 @@
 
     if test "$ODBC_TYPE" != "solid"; then
 
-printf "%s\n" "#define HAVE_SQLDATASOURCES 1" >>confdefs.h
+$as_echo "#define HAVE_SQLDATASOURCES 1" >>confdefs.h
 
     fi
   fi
 
 
-printf "%s\n" "#define HAVE_UODBC 1" >>confdefs.h
+$as_echo "#define HAVE_UODBC 1" >>confdefs.h
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST ODBC_SHARED_LIBADD"
@@ -57099,7 +53271,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_ODBC 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_ODBC 1
+_ACEOF
 
     fi
   fi
@@ -57221,10 +53395,10 @@
   fi
 
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for any ODBC driver support" >&5
-printf %s "checking for any ODBC driver support... " >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for any ODBC driver support" >&5
+$as_echo_n "checking for any ODBC driver support... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -57233,18 +53407,16 @@
 
 php_enable_opcache=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable Zend OPcache support" >&5
-printf %s "checking whether to enable Zend OPcache support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable Zend OPcache support" >&5
+$as_echo_n "checking whether to enable Zend OPcache support... " >&6; }
 # Check whether --enable-opcache was given.
-if test ${enable_opcache+y}
-then :
+if test "${enable_opcache+set}" = set; then :
   enableval=$enable_opcache; PHP_OPCACHE=$enableval
-else case e in #(
-  e)
+else
+
   PHP_OPCACHE=yes
   test "$PHP_ENABLE_ALL" && PHP_OPCACHE=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -57270,8 +53442,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -57279,24 +53451,22 @@
 
 php_enable_huge_code_pages=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable copying PHP CODE pages into HUGE PAGES" >&5
-printf %s "checking whether to enable copying PHP CODE pages into HUGE PAGES... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable copying PHP CODE pages into HUGE PAGES" >&5
+$as_echo_n "checking whether to enable copying PHP CODE pages into HUGE PAGES... " >&6; }
 # Check whether --enable-huge-code-pages was given.
-if test ${enable_huge_code_pages+y}
-then :
+if test "${enable_huge_code_pages+set}" = set; then :
   enableval=$enable_huge_code_pages; PHP_HUGE_CODE_PAGES=$enableval
-else case e in #(
-  e)
+else
+
   PHP_HUGE_CODE_PAGES=yes
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_HUGE_CODE_PAGES
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -57304,24 +53474,22 @@
 
 php_enable_opcache_jit=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable JIT" >&5
-printf %s "checking whether to enable JIT... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable JIT" >&5
+$as_echo_n "checking whether to enable JIT... " >&6; }
 # Check whether --enable-opcache-jit was given.
-if test ${enable_opcache_jit+y}
-then :
+if test "${enable_opcache_jit+set}" = set; then :
   enableval=$enable_opcache_jit; PHP_OPCACHE_JIT=$enableval
-else case e in #(
-  e)
+else
+
   PHP_OPCACHE_JIT=yes
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_OPCACHE_JIT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -57332,7 +53500,7 @@
 
   if test "$PHP_HUGE_CODE_PAGES" = "yes"; then
 
-printf "%s\n" "#define HAVE_HUGE_CODE_PAGES 1" >>confdefs.h
+$as_echo "#define HAVE_HUGE_CODE_PAGES 1" >>confdefs.h
 
   fi
 
@@ -57341,21 +53509,21 @@
       i[34567]86*|x86*|aarch64|amd64)
         ;;
       *)
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: JIT not supported by host architecture" >&5
-printf "%s\n" "$as_me: WARNING: JIT not supported by host architecture" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: JIT not supported by host architecture" >&5
+$as_echo "$as_me: WARNING: JIT not supported by host architecture" >&2;}
         PHP_OPCACHE_JIT=no
         ;;
     esac
     if test "$host_vendor" = "apple" && test "$host_cpu" = "aarch64" && test "$PHP_THREAD_SAFETY" = "yes"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: JIT not supported on Apple Silicon with ZTS" >&5
-printf "%s\n" "$as_me: WARNING: JIT not supported on Apple Silicon with ZTS" >&2;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: JIT not supported on Apple Silicon with ZTS" >&5
+$as_echo "$as_me: WARNING: JIT not supported on Apple Silicon with ZTS" >&2;}
       PHP_OPCACHE_JIT=no
     fi
   fi
 
   if test "$PHP_OPCACHE_JIT" = "yes"; then
 
-printf "%s\n" "#define HAVE_JIT 1" >>confdefs.h
+$as_echo "#define HAVE_JIT 1" >>confdefs.h
 
     ZEND_JIT_SRC="jit/zend_jit.c jit/zend_jit_gdb.c jit/zend_jit_vm_helpers.c"
 
@@ -57387,17 +53555,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for capstone >= 3.0.0" >&5
-printf %s "checking for capstone >= 3.0.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for capstone >= 3.0.0" >&5
+$as_echo_n "checking for capstone >= 3.0.0... " >&6; }
 
 if test -n "$CAPSTONE_CFLAGS"; then
     pkg_cv_CAPSTONE_CFLAGS="$CAPSTONE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capstone >= 3.0.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capstone >= 3.0.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "capstone >= 3.0.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CAPSTONE_CFLAGS=`$PKG_CONFIG --cflags "capstone >= 3.0.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -57411,10 +53579,10 @@
     pkg_cv_CAPSTONE_LIBS="$CAPSTONE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capstone >= 3.0.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"capstone >= 3.0.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "capstone >= 3.0.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_CAPSTONE_LIBS=`$PKG_CONFIG --libs "capstone >= 3.0.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -57428,8 +53596,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -57446,19 +53614,19 @@
 
 	have_capstone="no"
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 	have_capstone="no"
 else
 	CAPSTONE_CFLAGS=$pkg_cv_CAPSTONE_CFLAGS
 	CAPSTONE_LIBS=$pkg_cv_CAPSTONE_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	have_capstone="yes"
 fi
     if test "$have_capstone" = "yes"; then
 
-printf "%s\n" "#define HAVE_CAPSTONE 1" >>confdefs.h
+$as_echo "#define HAVE_CAPSTONE 1" >>confdefs.h
 
 
   for ac_i in $CAPSTONE_LIBS; do
@@ -57608,19 +53776,19 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST DASM_ARCH"
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for opagent in default path" >&5
-printf %s "checking for opagent in default path... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opagent in default path" >&5
+$as_echo_n "checking for opagent in default path... " >&6; }
     for i in /usr/local /usr; do
       if test -r $i/include/opagent.h; then
         OPAGENT_DIR=$i
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found in $i" >&5
-printf "%s\n" "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 "$OPAGENT_DIR"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-printf "%s\n" "not found" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
     else
 
   save_old_LDFLAGS=$LDFLAGS
@@ -57729,57 +53897,49 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for op_write_native_code in -lopagent" >&5
-printf %s "checking for op_write_native_code in -lopagent... " >&6; }
-if test ${ac_cv_lib_opagent_op_write_native_code+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for op_write_native_code in -lopagent" >&5
+$as_echo_n "checking for op_write_native_code in -lopagent... " >&6; }
+if ${ac_cv_lib_opagent_op_write_native_code+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lopagent  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char op_write_native_code (void);
+char op_write_native_code ();
 int
-main (void)
+main ()
 {
 return op_write_native_code ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_opagent_op_write_native_code=yes
-else case e in #(
-  e) ac_cv_lib_opagent_op_write_native_code=no ;;
-esac
+else
+  ac_cv_lib_opagent_op_write_native_code=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opagent_op_write_native_code" >&5
-printf "%s\n" "$ac_cv_lib_opagent_op_write_native_code" >&6; }
-if test "x$ac_cv_lib_opagent_op_write_native_code" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_opagent_op_write_native_code" >&5
+$as_echo "$ac_cv_lib_opagent_op_write_native_code" >&6; }
+if test "x$ac_cv_lib_opagent_op_write_native_code" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_OPROFILE 1" >>confdefs.h
+$as_echo "#define HAVE_OPROFILE 1" >>confdefs.h
 
 
   if test "$OPAGENT_DIR/include" != "/usr/include"; then
@@ -57914,38 +54074,40 @@
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_opagent_op_write_native_code
 
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-printf "%s\n" "not found" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+$as_echo "not found" >&6; }
+
 
-   ;;
-esac
 fi
 
     fi
 
   fi
 
+  for ac_func in mprotect
+do :
   ac_fn_c_check_func "$LINENO" "mprotect" "ac_cv_func_mprotect"
-if test "x$ac_cv_func_mprotect" = xyes
-then :
-  printf "%s\n" "#define HAVE_MPROTECT 1" >>confdefs.h
+if test "x$ac_cv_func_mprotect" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_MPROTECT 1
+_ACEOF
 
 fi
+done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sysvipc shared memory support" >&5
-printf %s "checking for sysvipc shared memory support... " >&6; }
-  if test "$cross_compiling" = yes
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysvipc shared memory support" >&5
+$as_echo_n "checking for sysvipc shared memory support... " >&6; }
+  if test "$cross_compiling" = yes; then :
   have_shm_ipc=no
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -58013,30 +54175,26 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   have_shm_ipc=yes
-else case e in #(
-  e) have_shm_ipc=no ;;
-esac
+else
+  have_shm_ipc=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   if test "$have_shm_ipc" = "yes"; then
 
-printf "%s\n" "#define HAVE_SHM_IPC 1" >>confdefs.h
+$as_echo "#define HAVE_SHM_IPC 1" >>confdefs.h
 
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_shm_ipc" >&5
-printf "%s\n" "$have_shm_ipc" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_shm_ipc" >&5
+$as_echo "$have_shm_ipc" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mmap() using MAP_ANON shared memory support" >&5
-printf %s "checking for mmap() using MAP_ANON shared memory support... " >&6; }
-  if test "$cross_compiling" = yes
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mmap() using MAP_ANON shared memory support" >&5
+$as_echo_n "checking for mmap() using MAP_ANON shared memory support... " >&6; }
+  if test "$cross_compiling" = yes; then :
 
   case $host_alias in
     *linux*)
@@ -58047,8 +54205,8 @@
       ;;
   esac
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -58098,165 +54256,140 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   have_shm_mmap_anon=yes
-else case e in #(
-  e) have_shm_mmap_anon=no ;;
-esac
+else
+  have_shm_mmap_anon=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   if test "$have_shm_mmap_anon" = "yes"; then
 
-printf "%s\n" "#define HAVE_SHM_MMAP_ANON 1" >>confdefs.h
+$as_echo "#define HAVE_SHM_MMAP_ANON 1" >>confdefs.h
 
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_shm_mmap_anon" >&5
-printf "%s\n" "$have_shm_mmap_anon" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_shm_mmap_anon" >&5
+$as_echo "$have_shm_mmap_anon" >&6; }
 
 
 
   unset ac_cv_lib_rt_shm_open
   unset ac_cv_lib_rt___shm_open
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shm_open in -lrt" >&5
-printf %s "checking for shm_open in -lrt... " >&6; }
-if test ${ac_cv_lib_rt_shm_open+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shm_open in -lrt" >&5
+$as_echo_n "checking for shm_open in -lrt... " >&6; }
+if ${ac_cv_lib_rt_shm_open+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char shm_open (void);
+char shm_open ();
 int
-main (void)
+main ()
 {
 return shm_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_rt_shm_open=yes
-else case e in #(
-  e) ac_cv_lib_rt_shm_open=no ;;
-esac
+else
+  ac_cv_lib_rt_shm_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_shm_open" >&5
-printf "%s\n" "$ac_cv_lib_rt_shm_open" >&6; }
-if test "x$ac_cv_lib_rt_shm_open" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_shm_open" >&5
+$as_echo "$ac_cv_lib_rt_shm_open" >&6; }
+if test "x$ac_cv_lib_rt_shm_open" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __shm_open in -lrt" >&5
-printf %s "checking for __shm_open in -lrt... " >&6; }
-if test ${ac_cv_lib_rt___shm_open+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __shm_open in -lrt" >&5
+$as_echo_n "checking for __shm_open in -lrt... " >&6; }
+if ${ac_cv_lib_rt___shm_open+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __shm_open (void);
+char __shm_open ();
 int
-main (void)
+main ()
 {
 return __shm_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_rt___shm_open=yes
-else case e in #(
-  e) ac_cv_lib_rt___shm_open=no ;;
-esac
+else
+  ac_cv_lib_rt___shm_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt___shm_open" >&5
-printf "%s\n" "$ac_cv_lib_rt___shm_open" >&6; }
-if test "x$ac_cv_lib_rt___shm_open" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt___shm_open" >&5
+$as_echo "$ac_cv_lib_rt___shm_open" >&6; }
+if test "x$ac_cv_lib_rt___shm_open" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -58274,10 +54407,10 @@
 
 
 
-printf "%s\n" "#define HAVE_SHM_OPEN 1" >>confdefs.h
+$as_echo "#define HAVE_SHM_OPEN 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBRT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBRT 1" >>confdefs.h
 
     ac_cv_func_shm_open=yes
   else
@@ -58286,140 +54419,118 @@
   unset ac_cv_lib_root_shm_open
   unset ac_cv_lib_root___shm_open
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shm_open in -lroot" >&5
-printf %s "checking for shm_open in -lroot... " >&6; }
-if test ${ac_cv_lib_root_shm_open+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shm_open in -lroot" >&5
+$as_echo_n "checking for shm_open in -lroot... " >&6; }
+if ${ac_cv_lib_root_shm_open+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lroot  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char shm_open (void);
+char shm_open ();
 int
-main (void)
+main ()
 {
 return shm_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_root_shm_open=yes
-else case e in #(
-  e) ac_cv_lib_root_shm_open=no ;;
-esac
+else
+  ac_cv_lib_root_shm_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root_shm_open" >&5
-printf "%s\n" "$ac_cv_lib_root_shm_open" >&6; }
-if test "x$ac_cv_lib_root_shm_open" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root_shm_open" >&5
+$as_echo "$ac_cv_lib_root_shm_open" >&6; }
+if test "x$ac_cv_lib_root_shm_open" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __shm_open in -lroot" >&5
-printf %s "checking for __shm_open in -lroot... " >&6; }
-if test ${ac_cv_lib_root___shm_open+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __shm_open in -lroot" >&5
+$as_echo_n "checking for __shm_open in -lroot... " >&6; }
+if ${ac_cv_lib_root___shm_open+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lroot  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __shm_open (void);
+char __shm_open ();
 int
-main (void)
+main ()
 {
 return __shm_open ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_root___shm_open=yes
-else case e in #(
-  e) ac_cv_lib_root___shm_open=no ;;
-esac
+else
+  ac_cv_lib_root___shm_open=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root___shm_open" >&5
-printf "%s\n" "$ac_cv_lib_root___shm_open" >&6; }
-if test "x$ac_cv_lib_root___shm_open" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_root___shm_open" >&5
+$as_echo "$ac_cv_lib_root___shm_open" >&6; }
+if test "x$ac_cv_lib_root___shm_open" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lroot"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -58437,10 +54548,10 @@
 
 
 
-printf "%s\n" "#define HAVE_SHM_OPEN 1" >>confdefs.h
+$as_echo "#define HAVE_SHM_OPEN 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBROOT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBROOT 1" >>confdefs.h
 
     ac_cv_func_shm_open=yes
   else
@@ -58453,13 +54564,12 @@
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mmap() using shm_open() shared memory support" >&5
-printf %s "checking for mmap() using shm_open() shared memory support... " >&6; }
-  if test "$cross_compiling" = yes
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mmap() using shm_open() shared memory support" >&5
+$as_echo_n "checking for mmap() using shm_open() shared memory support... " >&6; }
+  if test "$cross_compiling" = yes; then :
   have_shm_mmap_posix=no
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -58526,21 +54636,18 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   have_shm_mmap_posix=yes
-else case e in #(
-  e) have_shm_mmap_posix=no ;;
-esac
+else
+  have_shm_mmap_posix=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   if test "$have_shm_mmap_posix" = "yes"; then
 
-printf "%s\n" "#define HAVE_SHM_MMAP_POSIX 1" >>confdefs.h
+$as_echo "#define HAVE_SHM_MMAP_POSIX 1" >>confdefs.h
 
 
   save_old_LDFLAGS=$LDFLAGS
@@ -58647,51 +54754,43 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shm_unlink in -lrt" >&5
-printf %s "checking for shm_unlink in -lrt... " >&6; }
-if test ${ac_cv_lib_rt_shm_unlink+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shm_unlink in -lrt" >&5
+$as_echo_n "checking for shm_unlink in -lrt... " >&6; }
+if ${ac_cv_lib_rt_shm_unlink+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char shm_unlink (void);
+char shm_unlink ();
 int
-main (void)
+main ()
 {
 return shm_unlink ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_rt_shm_unlink=yes
-else case e in #(
-  e) ac_cv_lib_rt_shm_unlink=no ;;
-esac
+else
+  ac_cv_lib_rt_shm_unlink=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_shm_unlink" >&5
-printf "%s\n" "$ac_cv_lib_rt_shm_unlink" >&6; }
-if test "x$ac_cv_lib_rt_shm_unlink" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_shm_unlink" >&5
+$as_echo "$ac_cv_lib_rt_shm_unlink" >&6; }
+if test "x$ac_cv_lib_rt_shm_unlink" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -58719,59 +54818,52 @@
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_rt_shm_unlink
 
-   ;;
-esac
+
 fi
 
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_shm_mmap_posix" >&5
-printf "%s\n" "$have_shm_mmap_posix" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_shm_mmap_posix" >&5
+$as_echo "$have_shm_mmap_posix" >&6; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-implicit-fallthrough" >&5
+$as_echo_n "checking whether C compiler accepts -Wno-implicit-fallthrough... " >&6; }
+if ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-implicit-fallthrough" >&5
-printf %s "checking whether C compiler accepts -Wno-implicit-fallthrough... " >&6; }
-if test ${ax_cv_check_cflags__Werror__Wno_implicit_fallthrough+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wno-implicit-fallthrough"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__Wno_implicit_fallthrough=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&5
+$as_echo "$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wno_implicit_fallthrough" = xyes; then :
   PHP_OPCACHE_CFLAGS="$PHP_OPCACHE_CFLAGS -Wno-implicit-fallthrough"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
 
@@ -58935,7 +55027,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_OPCACHE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_OPCACHE 1
+_ACEOF
 
     fi
   fi
@@ -59131,18 +55225,16 @@
 
 php_enable_pcntl=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable pcntl support" >&5
-printf %s "checking whether to enable pcntl support... " >&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+y}
-then :
+if test "${enable_pcntl+set}" = set; then :
   enableval=$enable_pcntl; PHP_PCNTL=$enableval
-else case e in #(
-  e)
+else
+
   PHP_PCNTL=no
   test "$PHP_ENABLE_ALL" && PHP_PCNTL=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -59168,113 +55260,67 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$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 :
   ac_fn_c_check_func "$LINENO" "fork" "ac_cv_func_fork"
-if test "x$ac_cv_func_fork" = xyes
-then :
-  printf "%s\n" "#define HAVE_FORK 1" >>confdefs.h
+if test "x$ac_cv_func_fork" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_FORK 1
+_ACEOF
 
-else case e in #(
-  e) as_fn_error $? "pcntl: fork() not supported by this platform" "$LINENO" 5 ;;
-esac
+else
+  as_fn_error $? "pcntl: fork() not supported by this platform" "$LINENO" 5
 fi
-
 done
 
   for ac_func in waitpid
 do :
   ac_fn_c_check_func "$LINENO" "waitpid" "ac_cv_func_waitpid"
-if test "x$ac_cv_func_waitpid" = xyes
-then :
-  printf "%s\n" "#define HAVE_WAITPID 1" >>confdefs.h
+if test "x$ac_cv_func_waitpid" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_WAITPID 1
+_ACEOF
 
-else case e in #(
-  e) as_fn_error $? "pcntl: waitpid() not supported by this platform" "$LINENO" 5 ;;
-esac
+else
+  as_fn_error $? "pcntl: waitpid() not supported by this platform" "$LINENO" 5
 fi
-
 done
 
   for ac_func in sigaction
 do :
   ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction"
-if test "x$ac_cv_func_sigaction" = xyes
-then :
-  printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h
+if test "x$ac_cv_func_sigaction" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SIGACTION 1
+_ACEOF
 
-else case e in #(
-  e) as_fn_error $? "pcntl: sigaction() not supported by this platform" "$LINENO" 5 ;;
-esac
+else
+  as_fn_error $? "pcntl: sigaction() not supported by this platform" "$LINENO" 5
 fi
-
 done
-  ac_fn_c_check_func "$LINENO" "getpriority" "ac_cv_func_getpriority"
-if test "x$ac_cv_func_getpriority" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETPRIORITY 1" >>confdefs.h
 
-fi
-ac_fn_c_check_func "$LINENO" "setpriority" "ac_cv_func_setpriority"
-if test "x$ac_cv_func_setpriority" = xyes
-then :
-  printf "%s\n" "#define HAVE_SETPRIORITY 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "wait3" "ac_cv_func_wait3"
-if test "x$ac_cv_func_wait3" = xyes
-then :
-  printf "%s\n" "#define HAVE_WAIT3 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "wait4" "ac_cv_func_wait4"
-if test "x$ac_cv_func_wait4" = xyes
-then :
-  printf "%s\n" "#define HAVE_WAIT4 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "sigwaitinfo" "ac_cv_func_sigwaitinfo"
-if test "x$ac_cv_func_sigwaitinfo" = xyes
-then :
-  printf "%s\n" "#define HAVE_SIGWAITINFO 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "sigtimedwait" "ac_cv_func_sigtimedwait"
-if test "x$ac_cv_func_sigtimedwait" = xyes
-then :
-  printf "%s\n" "#define HAVE_SIGTIMEDWAIT 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "unshare" "ac_cv_func_unshare"
-if test "x$ac_cv_func_unshare" = xyes
-then :
-  printf "%s\n" "#define HAVE_UNSHARE 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "rfork" "ac_cv_func_rfork"
-if test "x$ac_cv_func_rfork" = xyes
-then :
-  printf "%s\n" "#define HAVE_RFORK 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "forkx" "ac_cv_func_forkx"
-if test "x$ac_cv_func_forkx" = xyes
-then :
-  printf "%s\n" "#define HAVE_FORKX 1" >>confdefs.h
+  for ac_func in getpriority setpriority wait3 wait4 sigwaitinfo sigtimedwait unshare rfork forkx
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
+done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for siginfo_t" >&5
-printf %s "checking for siginfo_t... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for siginfo_t" >&5
+$as_echo_n "checking for siginfo_t... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -59284,7 +55330,7 @@
     #endif
 
 int
-main (void)
+main ()
 {
 
     siginfo_t info;
@@ -59293,21 +55339,19 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     PCNTL_CFLAGS="-DHAVE_STRUCT_SIGINFO_T"
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-   ;;
-esac
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
 
   ext_builddir=ext/pcntl
@@ -59443,7 +55487,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PCNTL 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PCNTL 1
+_ACEOF
 
     fi
   fi
@@ -59570,21 +55616,375 @@
 
 
 
+php_enable_pdo=yes
+
+{ $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 :
+  enableval=$enable_pdo; PHP_PDO=$enableval
+else
+
+  PHP_PDO=yes
+  test "$PHP_ENABLE_ALL" && PHP_PDO=$PHP_ENABLE_ALL
+
+fi
+
+
+
+ext_output="yes, shared"
+ext_shared=yes
+case $PHP_PDO in
+shared,*)
+  PHP_PDO=`echo "$PHP_PDO"|$SED 's/^shared,//'`
+  ;;
+shared)
+  PHP_PDO=yes
+  ;;
+no)
+  ext_output=no
+  ext_shared=no
+  ;;
+*)
+  ext_output=yes
+  ext_shared=no
+  ;;
+esac
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
+
+
+
+
+if test "$PHP_PDO" != "no"; then
+
+    PHP_PDO=yes
+
+
+  ext_builddir=ext/pdo
+  ext_srcdir=$abs_srcdir/ext/pdo
+  ext_dir=ext/pdo
+
+  ac_extra=
+
+  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
+    PHP_PDO_SHARED=no
+
+
+  case $ext_dir in
+  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+  /*) ac_srcdir=`echo "$ext_dir"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+  *) ac_srcdir="$abs_srcdir/$ext_dir/"; ac_bdir="$ext_dir/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
+  esac
+
+
+
+  b_c_pre=$php_c_pre
+  b_cxx_pre=$php_cxx_pre
+  b_c_meta=$php_c_meta
+  b_cxx_meta=$php_cxx_meta
+  b_c_post=$php_c_post
+  b_cxx_post=$php_cxx_post
+  b_lo=$php_lo
+
+
+  old_IFS=$IFS
+  for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
+
+      IFS=.
+      set $ac_src
+      ac_obj=$1
+      IFS=$old_IFS
+
+      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
+
+      case $ac_src in
+        *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+        *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+        *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
+      esac
+
+      ac_comp="$ac_comp -MMD -MF $ac_bdir$ac_obj.dep -MT $ac_bdir$ac_obj.lo"
+
+    cat >>Makefile.objects<<EOF
+-include $ac_bdir$ac_obj.dep
+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
+	$ac_comp
+EOF
+  done
+
+
+    EXT_STATIC="$EXT_STATIC pdo;$ext_dir"
+    if test "$ext_shared" != "nocli"; then
+      EXT_CLI_STATIC="$EXT_CLI_STATIC pdo;$ext_dir"
+    fi
+  else
+    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
+      PHP_PDO_SHARED=yes
+
+  case $ext_dir in
+  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+  /*) ac_srcdir=`echo "$ext_dir"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+  *) ac_srcdir="$abs_srcdir/$ext_dir/"; ac_bdir="$ext_dir/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
+  esac
+
+
+
+  b_c_pre=$shared_c_pre
+  b_cxx_pre=$shared_cxx_pre
+  b_c_meta=$shared_c_meta
+  b_cxx_meta=$shared_cxx_meta
+  b_c_post=$shared_c_post
+  b_cxx_post=$shared_cxx_post
+  b_lo=$shared_lo
+
+
+  old_IFS=$IFS
+  for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
+
+      IFS=.
+      set $ac_src
+      ac_obj=$1
+      IFS=$old_IFS
+
+      shared_objects_pdo="$shared_objects_pdo $ac_bdir$ac_obj.lo"
+
+      case $ac_src in
+        *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -DZEND_COMPILE_DL_EXT=1 -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+        *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -DZEND_COMPILE_DL_EXT=1 -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+        *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -DZEND_COMPILE_DL_EXT=1 -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta $ac_extra -DZEND_COMPILE_DL_EXT=1 -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
+      esac
+
+      ac_comp="$ac_comp -MMD -MF $ac_bdir$ac_obj.dep -MT $ac_bdir$ac_obj.lo"
+
+    cat >>Makefile.objects<<EOF
+-include $ac_bdir$ac_obj.dep
+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
+	$ac_comp
+EOF
+  done
+
+
+  install_modules="install-modules"
+  suffix=la
+
+  case $host_alias in
+    *aix*)
+      additional_flags="-Wl,-G"
+      ;;
+  esac
+
+  if test "x" = "xyes"; then
+    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo.$suffix"
+  else
+    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo.$suffix"
+  fi
+
+  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo"
+
+  cat >>Makefile.objects<<EOF
+\$(phplibdir)/pdo.$suffix: $ext_builddir/pdo.$suffix
+	\$(LIBTOOL) --tag=CC --mode=install cp $ext_builddir/pdo.$suffix \$(phplibdir)
+
+$ext_builddir/pdo.$suffix: \$(shared_objects_pdo) \$(PDO_SHARED_DEPENDENCIES)
+	\$(LIBTOOL) --tag=CC --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_pdo) \$(PDO_SHARED_LIBADD)
+
+EOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PDO 1
+_ACEOF
+
+    fi
+  fi
+
+  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
+    PHP_PDO_SHARED=no
+    case "$PHP_SAPI" in
+      cgi|embed|phpdbg)
+
+
+  case $ext_dir in
+  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+  /*) ac_srcdir=`echo "$ext_dir"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+  *) ac_srcdir="$abs_srcdir/$ext_dir/"; ac_bdir="$ext_dir/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
+  esac
+
+
+
+  b_c_pre=$php_c_pre
+  b_cxx_pre=$php_cxx_pre
+  b_c_meta=$php_c_meta
+  b_cxx_meta=$php_cxx_meta
+  b_c_post=$php_c_post
+  b_cxx_post=$php_cxx_post
+  b_lo=$php_lo
+
+
+  old_IFS=$IFS
+  for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
+
+      IFS=.
+      set $ac_src
+      ac_obj=$1
+      IFS=$old_IFS
+
+      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
+
+      case $ac_src in
+        *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+        *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+        *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
+      esac
+
+      ac_comp="$ac_comp -MMD -MF $ac_bdir$ac_obj.dep -MT $ac_bdir$ac_obj.lo"
+
+    cat >>Makefile.objects<<EOF
+-include $ac_bdir$ac_obj.dep
+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
+	$ac_comp
+EOF
+  done
+
+
+        EXT_STATIC="$EXT_STATIC pdo;$ext_dir"
+        ;;
+      *)
+
+
+  case $ext_dir in
+  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+  /*) ac_srcdir=`echo "$ext_dir"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+  *) ac_srcdir="$abs_srcdir/$ext_dir/"; ac_bdir="$ext_dir/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
+  esac
+
+
+
+  b_c_pre=$php_c_pre
+  b_cxx_pre=$php_cxx_pre
+  b_c_meta=$php_c_meta
+  b_cxx_meta=$php_cxx_meta
+  b_c_post=$php_c_post
+  b_cxx_post=$php_cxx_post
+  b_lo=$php_lo
+
+
+  old_IFS=$IFS
+  for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
+
+      IFS=.
+      set $ac_src
+      ac_obj=$1
+      IFS=$old_IFS
+
+      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
+
+      case $ac_src in
+        *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+        *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+        *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
+        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
+      esac
+
+      ac_comp="$ac_comp -MMD -MF $ac_bdir$ac_obj.dep -MT $ac_bdir$ac_obj.lo"
+
+    cat >>Makefile.objects<<EOF
+-include $ac_bdir$ac_obj.dep
+$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
+	$ac_comp
+EOF
+  done
+
+
+        ;;
+    esac
+    EXT_CLI_STATIC="$EXT_CLI_STATIC pdo;$ext_dir"
+  fi
+
+
+    BUILD_DIR="$BUILD_DIR $ext_builddir"
+
+
+
+  if test "$ext_builddir" = "."; then
+    PHP_PECL_EXTENSION=pdo
+
+  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
+
+  fi
+
+
+  am_i_shared=$PHP_PDO_SHARED
+  is_it_shared=$PHP_SPL_SHARED
+  is_it_enabled=$PHP_SPL
+  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
+    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.
+" "$LINENO" 5
+  fi
+  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
+    as_fn_error $? "
+You've configured extension pdo, which depends on extension spl,
+but you've either not enabled spl, or have disabled it.
+" "$LINENO" 5
+  fi
+
+
+
+    header_path=ext/pdo
+    for header_file in php_pdo.h php_pdo_driver.h php_pdo_error.h; do
+      hp_hf="$header_path/$header_file"
+
+
+  unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
+
+  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
+  if test -n "$unique" && test "`eval $cmd`" = "" ; then
+    eval "INSTALLHEADERS$unique=set"
+
+        INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
+
+  fi
+
+    done
+
+
+
+
+  src=$ext_srcdir/Makefile.frag
+  ac_srcdir=$ext_srcdir
+  ac_builddir=$ext_builddir
+  test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
+
+fi
+
+
+
+
+
 php_with_pdo_dblib=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO_DBLIB support via FreeTDS" >&5
-printf %s "checking for PDO_DBLIB support via FreeTDS... " >&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+y}
-then :
+if test "${with_pdo_dblib+set}" = set; then :
   withval=$with_pdo_dblib; PHP_PDO_DBLIB=$withval
-else case e in #(
-  e)
+else
+
   PHP_PDO_DBLIB=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_DBLIB=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -59610,8 +56010,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -59728,66 +56128,57 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dbsqlexec in -lsybdb" >&5
-printf %s "checking for dbsqlexec in -lsybdb... " >&6; }
-if test ${ac_cv_lib_sybdb_dbsqlexec+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbsqlexec in -lsybdb" >&5
+$as_echo_n "checking for dbsqlexec in -lsybdb... " >&6; }
+if ${ac_cv_lib_sybdb_dbsqlexec+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsybdb  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dbsqlexec (void);
+char dbsqlexec ();
 int
-main (void)
+main ()
 {
 return dbsqlexec ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sybdb_dbsqlexec=yes
-else case e in #(
-  e) ac_cv_lib_sybdb_dbsqlexec=no ;;
-esac
+else
+  ac_cv_lib_sybdb_dbsqlexec=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sybdb_dbsqlexec" >&5
-printf "%s\n" "$ac_cv_lib_sybdb_dbsqlexec" >&6; }
-if test "x$ac_cv_lib_sybdb_dbsqlexec" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sybdb_dbsqlexec" >&5
+$as_echo "$ac_cv_lib_sybdb_dbsqlexec" >&6; }
+if test "x$ac_cv_lib_sybdb_dbsqlexec" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sybdb_dbsqlexec
 
       as_fn_error $? "Cannot find FreeTDS in known installation directories" "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
 
@@ -59964,13 +56355,12 @@
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
-printf %s "checking for PDO includes... " >&6; }
-if test ${pdo_cv_inc_path+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
+if ${pdo_cv_inc_path+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     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
@@ -59978,11 +56368,10 @@
     elif test -f $phpincludedir/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$phpincludedir/ext
     fi
-   ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
-printf "%s\n" "$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
@@ -60125,7 +56514,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PDO_DBLIB 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PDO_DBLIB 1
+_ACEOF
 
     fi
   fi
@@ -60246,51 +56637,43 @@
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dnet_addr in -ldnet_stub" >&5
-printf %s "checking for dnet_addr in -ldnet_stub... " >&6; }
-if test ${ac_cv_lib_dnet_stub_dnet_addr+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_dnet_stub_dnet_addr+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dnet_addr (void);
+char dnet_addr ();
 int
-main (void)
+main ()
 {
 return dnet_addr ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dnet_stub_dnet_addr=yes
-else case e in #(
-  e) ac_cv_lib_dnet_stub_dnet_addr=no ;;
-esac
+else
+  ac_cv_lib_dnet_stub_dnet_addr=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_addr" >&5
-printf "%s\n" "$ac_cv_lib_dnet_stub_dnet_addr" >&6; }
-if test "x$ac_cv_lib_dnet_stub_dnet_addr" = xyes
-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" = xyes; then :
 
 
 
@@ -60393,7 +56776,7 @@
 fi
 
 
-printf "%s\n" "#define HAVE_PDO_DBLIB 1" >>confdefs.h
+$as_echo "#define HAVE_PDO_DBLIB 1" >>confdefs.h
 
 
   PHP_VAR_SUBST="$PHP_VAR_SUBST PDO_DBLIB_SHARED_LIBADD"
@@ -60426,19 +56809,17 @@
 
 php_with_pdo_firebird=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Firebird support for PDO" >&5
-printf %s "checking for Firebird support for PDO... " >&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+y}
-then :
+if test "${with_pdo_firebird+set}" = set; then :
   withval=$with_pdo_firebird; PHP_PDO_FIREBIRD=$withval
-else case e in #(
-  e)
+else
+
   PHP_PDO_FIREBIRD=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_FIREBIRD=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -60464,8 +56845,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -60478,13 +56859,12 @@
 
   # Extract the first word of "fb_config", so it can be a program name with args.
 set dummy fb_config; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_FB_CONFIG+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) case $FB_CONFIG in
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_FB_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $FB_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_FB_CONFIG="$FB_CONFIG" # Let the user override the test with a path.
   ;;
@@ -60493,15 +56873,11 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_FB_CONFIG="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_FB_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
@@ -60510,28 +56886,27 @@
 
   test -z "$ac_cv_path_FB_CONFIG" && ac_cv_path_FB_CONFIG="no"
   ;;
-esac ;;
 esac
 fi
 FB_CONFIG=$ac_cv_path_FB_CONFIG
 if test -n "$FB_CONFIG"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FB_CONFIG" >&5
-printf "%s\n" "$FB_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FB_CONFIG" >&5
+$as_echo "$FB_CONFIG" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
 
   if test -x "$FB_CONFIG" && test "$PHP_PDO_FIREBIRD" = "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libfbconfig" >&5
-printf %s "checking for libfbconfig... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libfbconfig" >&5
+$as_echo_n "checking for libfbconfig... " >&6; }
     FB_CFLAGS=`$FB_CONFIG --cflags`
     FB_LIBDIR=`$FB_CONFIG --libs`
     FB_VERSION=`$FB_CONFIG --version`
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: version $FB_VERSION" >&5
-printf "%s\n" "version $FB_VERSION" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: version $FB_VERSION" >&5
+$as_echo "version $FB_VERSION" >&6; }
 
   for ac_i in $FB_LIBDIR; do
     case $ac_i in
@@ -60790,51 +57165,43 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lfbclient" >&5
-printf %s "checking for isc_detach_database in -lfbclient... " >&6; }
-if test ${ac_cv_lib_fbclient_isc_detach_database+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_fbclient_isc_detach_database+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfbclient  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char isc_detach_database (void);
+char isc_detach_database ();
 int
-main (void)
+main ()
 {
 return isc_detach_database ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_fbclient_isc_detach_database=yes
-else case e in #(
-  e) ac_cv_lib_fbclient_isc_detach_database=no ;;
-esac
+else
+  ac_cv_lib_fbclient_isc_detach_database=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_fbclient_isc_detach_database" >&5
-printf "%s\n" "$ac_cv_lib_fbclient_isc_detach_database" >&6; }
-if test "x$ac_cv_lib_fbclient_isc_detach_database" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -60842,8 +57209,8 @@
       FIREBIRD_LIBNAME=fbclient
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_fbclient_isc_detach_database
@@ -60955,51 +57322,43 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lgds" >&5
-printf %s "checking for isc_detach_database in -lgds... " >&6; }
-if test ${ac_cv_lib_gds_isc_detach_database+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_gds_isc_detach_database+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lgds  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char isc_detach_database (void);
+char isc_detach_database ();
 int
-main (void)
+main ()
 {
 return isc_detach_database ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_gds_isc_detach_database=yes
-else case e in #(
-  e) ac_cv_lib_gds_isc_detach_database=no ;;
-esac
+else
+  ac_cv_lib_gds_isc_detach_database=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gds_isc_detach_database" >&5
-printf "%s\n" "$ac_cv_lib_gds_isc_detach_database" >&6; }
-if test "x$ac_cv_lib_gds_isc_detach_database" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -61007,8 +57366,8 @@
         FIREBIRD_LIBNAME=gds
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_gds_isc_detach_database
@@ -61120,51 +57479,43 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isc_detach_database in -lib_util" >&5
-printf %s "checking for isc_detach_database in -lib_util... " >&6; }
-if test ${ac_cv_lib_ib_util_isc_detach_database+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_ib_util_isc_detach_database+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lib_util  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char isc_detach_database (void);
+char isc_detach_database ();
 int
-main (void)
+main ()
 {
 return isc_detach_database ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ib_util_isc_detach_database=yes
-else case e in #(
-  e) ac_cv_lib_ib_util_isc_detach_database=no ;;
-esac
+else
+  ac_cv_lib_ib_util_isc_detach_database=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ib_util_isc_detach_database" >&5
-printf "%s\n" "$ac_cv_lib_ib_util_isc_detach_database" >&6; }
-if test "x$ac_cv_lib_ib_util_isc_detach_database" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -61172,26 +57523,23 @@
           FIREBIRD_LIBNAME=ib_util
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_ib_util_isc_detach_database
 
           as_fn_error $? "libfbclient, libgds or libib_util not found! Check config.log for more information." "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
 
-   ;;
-esac
+
 fi
 
 
-   ;;
-esac
+
 fi
 
 
@@ -61325,13 +57673,12 @@
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
-printf %s "checking for PDO includes... " >&6; }
-if test ${pdo_cv_inc_path+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
+if ${pdo_cv_inc_path+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     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
@@ -61339,11 +57686,10 @@
     elif test -f $phpincludedir/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$phpincludedir/ext
     fi
-   ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
-printf "%s\n" "$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
@@ -61352,7 +57698,7 @@
 
 
 
-printf "%s\n" "#define HAVE_PDO_FIREBIRD 1" >>confdefs.h
+$as_echo "#define HAVE_PDO_FIREBIRD 1" >>confdefs.h
 
 
   ext_builddir=ext/pdo_firebird
@@ -61488,7 +57834,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PDO_FIREBIRD 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PDO_FIREBIRD 1
+_ACEOF
 
     fi
   fi
@@ -61639,19 +57987,17 @@
 
 php_with_pdo_mysql=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MySQL support for PDO" >&5
-printf %s "checking for MySQL support for PDO... " >&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+y}
-then :
+if test "${with_pdo_mysql+set}" = set; then :
   withval=$with_pdo_mysql; PHP_PDO_MYSQL=$withval
-else case e in #(
-  e)
+else
+
   PHP_PDO_MYSQL=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_MYSQL=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -61677,8 +58023,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -61687,40 +58033,40 @@
 
 php_with_zlib_dir=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the location of libz" >&5
-printf %s "checking for the location of libz... " >&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+y}
-then :
+if test "${with_zlib_dir+set}" = set; then :
   withval=$with_zlib_dir; PHP_ZLIB_DIR=$withval
-else case e in #(
-  e)
+else
+
   PHP_ZLIB_DIR=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_ZLIB_DIR
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
 fi
 
 if test "$PHP_PDO_MYSQL" != "no"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MySQL UNIX socket location" >&5
-printf %s "checking for MySQL UNIX socket location... " >&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
 
-printf "%s\n" "#define PHP_MYSQL_UNIX_SOCK_ADDR \"$MYSQL_SOCK\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK"
+_ACEOF
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
-printf "%s\n" "$MYSQL_SOCK" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
+$as_echo "$MYSQL_SOCK" >&6; }
   elif test "$PHP_MYSQL_SOCK" = "yes"; then
 
   for i in  \
@@ -61742,18 +58088,20 @@
 
   if test -n "$MYSQL_SOCK"; then
 
-printf "%s\n" "#define PHP_MYSQL_UNIX_SOCK_ADDR \"$MYSQL_SOCK\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_MYSQL_UNIX_SOCK_ADDR "$MYSQL_SOCK"
+_ACEOF
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
-printf "%s\n" "$MYSQL_SOCK" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQL_SOCK" >&5
+$as_echo "$MYSQL_SOCK" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
   if test "$PHP_PDO" = "no" && test "$ext_shared" = "no"; then
@@ -61777,28 +58125,27 @@
   if test "$PHP_PDO_MYSQL" = "yes" || test "$PHP_PDO_MYSQL" = "mysqlnd"; then
         PHP_MYSQLND_ENABLED=yes
 
-printf "%s\n" "#define PDO_USE_MYSQLND 1" >>confdefs.h
+$as_echo "#define PDO_USE_MYSQLND 1" >>confdefs.h
 
   else
 
-printf "%s\n" "#define HAVE_MYSQL 1" >>confdefs.h
+$as_echo "#define HAVE_MYSQL 1" >>confdefs.h
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mysql_config" >&5
-printf %s "checking for mysql_config... " >&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
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PDO_MYSQL_CONFIG" >&5
-printf "%s\n" "$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
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_SED+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) case $SED in
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $SED in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_SED="$SED" # Let the user override the test with a path.
   ;;
@@ -61807,15 +58154,11 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_SED="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_SED="$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
@@ -61823,16 +58166,15 @@
 IFS=$as_save_IFS
 
   ;;
-esac ;;
 esac
 fi
 SED=$ac_cv_path_SED
 if test -n "$SED"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
-printf "%s\n" "$SED" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
+$as_echo "$SED" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -61840,10 +58182,10 @@
       PDO_MYSQL_LIBS=`$PDO_MYSQL_CONFIG --libs | $SED -e "s/'//g"`
       PDO_MYSQL_INCLUDE=`$PDO_MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
     elif test -n "$PDO_MYSQL_DIR"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-printf "%s\n" "not found" >&6; }
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mysql install under $PDO_MYSQL_DIR" >&5
-printf %s "checking for mysql install under $PDO_MYSQL_DIR... " >&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
@@ -61856,11 +58198,11 @@
       fi
 
       if test -r "$PDO_MYSQL_LIB_DIR"; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: libs under $PDO_MYSQL_LIB_DIR; seems promising" >&5
-printf "%s\n" "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
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: can not find it" >&5
-printf "%s\n" "can not find it" >&6; }
+        { $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
 
@@ -61897,8 +58239,8 @@
 
       PDO_MYSQL_INCLUDE=-I$PDO_MYSQL_INC_DIR
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-printf "%s\n" "not found" >&6; }
+      { $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
 
@@ -62044,13 +58386,12 @@
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
-printf %s "checking for PDO includes... " >&6; }
-if test ${pdo_cv_inc_path+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
+if ${pdo_cv_inc_path+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     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
@@ -62058,11 +58399,10 @@
     elif test -f $phpincludedir/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$phpincludedir/ext
     fi
-   ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
-printf "%s\n" "$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
@@ -62073,7 +58413,9 @@
   if test -n "$PDO_MYSQL_CONFIG"; then
     PDO_MYSQL_SOCKET=`$PDO_MYSQL_CONFIG --socket`
 
-printf "%s\n" "#define PDO_MYSQL_UNIX_ADDR \"$PDO_MYSQL_SOCKET\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PDO_MYSQL_UNIX_ADDR "$PDO_MYSQL_SOCKET"
+_ACEOF
 
   fi
 
@@ -62211,7 +58553,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PDO_MYSQL 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PDO_MYSQL 1
+_ACEOF
 
     fi
   fi
@@ -62411,19 +58755,17 @@
 
 php_with_pdo_oci=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle OCI support for PDO" >&5
-printf %s "checking Oracle OCI support for PDO... " >&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+y}
-then :
+if test "${with_pdo_oci+set}" = set; then :
   withval=$with_pdo_oci; PHP_PDO_OCI=$withval
-else case e in #(
-  e)
+else
+
   PHP_PDO_OCI=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_OCI=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -62449,8 +58791,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -62461,83 +58803,79 @@
     as_fn_error $? "PDO is not enabled! Add --enable-pdo to your configure line." "$LINENO" 5
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle Install-Dir" >&5
-printf %s "checking Oracle Install-Dir... " >&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
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PHP_PDO_OCI" >&5
-printf "%s\n" "$PHP_PDO_OCI" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PHP_PDO_OCI" >&5
+$as_echo "$PHP_PDO_OCI" >&6; }
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if that is sane" >&5
-printf %s "checking if that is sane... " >&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
     as_fn_error $? "You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_HOME." "$LINENO" 5
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   fi
 
   if test "instantclient" = "`echo $PDO_OCI_DIR | cut -d, -f1`" ; then
     # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-# declarations like 'int a3[[(sizeof (unsigned char)) >= 0]];'.
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-printf %s "checking size of long... " >&6; }
-if test ${ac_cv_sizeof_long+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_long" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if ${ac_cv_sizeof_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-printf "%s\n" "$ac_cv_sizeof_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
-printf %s "checking if we're at 64-bit platform... " >&6; }
-    if test "$ac_cv_sizeof_long" -eq 4
-then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
+$as_echo_n "checking if we're at 64-bit platform... " >&6; }
+    if test "$ac_cv_sizeof_long" -eq 4; then :
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
       PDO_OCI_CLIENT_DIR="client"
 
-else case e in #(
-  e)
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
       PDO_OCI_CLIENT_DIR="client64"
-     ;;
-esac
+
 fi
 
     PDO_OCI_LIB_DIR="`echo $PDO_OCI_DIR | cut -d, -f2`"
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle version" >&5
-printf %s "checking Oracle version... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle version" >&5
+$as_echo_n "checking Oracle version... " >&6; }
   PDO_OCI_LCS_BASE=$PDO_OCI_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME
     PDO_OCI_LCS=`ls $PDO_OCI_LCS_BASE.*.1 2> /dev/null | $PHP_PDO_OCI_TAIL1`
   if test -f "$PDO_OCI_LCS"; then
@@ -62547,12 +58885,12 @@
   else
     as_fn_error $? "Oracle libclntsh.$SHLIB_SUFFIX_NAME client library not found or its version is lower than 9" "$LINENO" 5
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_VERSION" >&5
-printf "%s\n" "$PDO_OCI_VERSION" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_VERSION" >&5
+$as_echo "$PDO_OCI_VERSION" >&6; }
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for oci.h" >&5
-printf %s "checking for oci.h... " >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for oci.h" >&5
+$as_echo_n "checking for oci.h... " >&6; }
         OCISDKRPMINC=`echo "$PDO_OCI_LIB_DIR" | $PHP_PDO_OCI_SED -e 's!^\(.*\)/lib/oracle/\(.*\)/\('${PDO_OCI_CLIENT_DIR}'\)/lib/*$!\1/include/oracle/\2/\3!'`
 
         OCISDKMANINC=`echo "$PDO_OCI_LIB_DIR" | $PHP_PDO_OCI_SED -e 's!^\(.*\)/lib/*$!\1/include!'`
@@ -62592,8 +58930,8 @@
 
   fi
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCISDKRPMINC" >&5
-printf "%s\n" "$OCISDKRPMINC" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKRPMINC" >&5
+$as_echo "$OCISDKRPMINC" >&6; }
     elif test -f "$OCISDKMANINC/oci.h" ; then
 
   if test "$OCISDKMANINC" != "/usr/include"; then
@@ -62626,8 +58964,8 @@
 
   fi
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCISDKMANINC" >&5
-printf "%s\n" "$OCISDKMANINC" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKMANINC" >&5
+$as_echo "$OCISDKMANINC" >&6; }
     elif test -f "$OCISDKZIPINC/oci.h" ; then
 
   if test "$OCISDKZIPINC" != "/usr/include"; then
@@ -62660,8 +58998,8 @@
 
   fi
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OCISDKZIPINC" >&5
-printf "%s\n" "$OCISDKZIPINC" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OCISDKZIPINC" >&5
+$as_echo "$OCISDKZIPINC" >&6; }
     else
       as_fn_error $? "I'm too dumb to figure out where the include dir is in your Instant Client install" "$LINENO" 5
     fi
@@ -62669,59 +59007,55 @@
 
   # 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]];'.
+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
 # This bug is HP SR number 8606223364.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
-printf %s "checking size of long... " >&6; }
-if test ${ac_cv_sizeof_long+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"
-then :
-
-else case e in #(
-  e) if test "$ac_cv_type_long" = yes; then
-     { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5
+$as_echo_n "checking size of long... " >&6; }
+if ${ac_cv_sizeof_long+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long"        "$ac_includes_default"; then :
+
+else
+  if test "$ac_cv_type_long" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "cannot compute sizeof (long)
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
    else
      ac_cv_sizeof_long=0
-   fi ;;
-esac
+   fi
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
-printf "%s\n" "$ac_cv_sizeof_long" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5
+$as_echo "$ac_cv_sizeof_long" >&6; }
 
 
 
-printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+_ACEOF
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
-printf %s "checking if we're at 64-bit platform... " >&6; }
-  if test "$ac_cv_sizeof_long" -eq 4
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we're at 64-bit platform" >&5
+$as_echo_n "checking if we're at 64-bit platform... " >&6; }
+  if test "$ac_cv_sizeof_long" -eq 4; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32"
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
     TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib"
-   ;;
-esac
+
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking OCI8 libraries dir" >&5
-printf %s "checking OCI8 libraries dir... " >&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
@@ -62731,8 +59065,8 @@
   else
     as_fn_error $? "Oracle required OCI8 libraries not found" "$LINENO" 5
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_LIB_DIR" >&5
-printf "%s\n" "$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
@@ -63108,8 +59442,8 @@
 
     fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking Oracle version" >&5
-printf %s "checking Oracle version... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking Oracle version" >&5
+$as_echo_n "checking Oracle version... " >&6; }
   PDO_OCI_LCS_BASE=$PDO_OCI_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME
     PDO_OCI_LCS=`ls $PDO_OCI_LCS_BASE.*.1 2> /dev/null | $PHP_PDO_OCI_TAIL1`
   if test -f "$PDO_OCI_LCS"; then
@@ -63119,8 +59453,8 @@
   else
     as_fn_error $? "Oracle libclntsh.$SHLIB_SUFFIX_NAME client library not found or its version is lower than 9" "$LINENO" 5
   fi
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_VERSION" >&5
-printf "%s\n" "$PDO_OCI_VERSION" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PDO_OCI_VERSION" >&5
+$as_echo "$PDO_OCI_VERSION" >&6; }
 
   fi
 
@@ -63299,68 +59633,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OCIEnvCreate in -lclntsh" >&5
-printf %s "checking for OCIEnvCreate in -lclntsh... " >&6; }
-if test ${ac_cv_lib_clntsh_OCIEnvCreate+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIEnvCreate in -lclntsh" >&5
+$as_echo_n "checking for OCIEnvCreate in -lclntsh... " >&6; }
+if ${ac_cv_lib_clntsh_OCIEnvCreate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lclntsh  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char OCIEnvCreate (void);
+char OCIEnvCreate ();
 int
-main (void)
+main ()
 {
 return OCIEnvCreate ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_clntsh_OCIEnvCreate=yes
-else case e in #(
-  e) ac_cv_lib_clntsh_OCIEnvCreate=no ;;
-esac
+else
+  ac_cv_lib_clntsh_OCIEnvCreate=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIEnvCreate" >&5
-printf "%s\n" "$ac_cv_lib_clntsh_OCIEnvCreate" >&6; }
-if test "x$ac_cv_lib_clntsh_OCIEnvCreate" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_OCIENVCREATE 1" >>confdefs.h
+$as_echo "#define HAVE_OCIENVCREATE 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_clntsh_OCIEnvCreate
 
-   ;;
-esac
+
 fi
 
 
@@ -63471,68 +59796,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OCIEnvNlsCreate in -lclntsh" >&5
-printf %s "checking for OCIEnvNlsCreate in -lclntsh... " >&6; }
-if test ${ac_cv_lib_clntsh_OCIEnvNlsCreate+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIEnvNlsCreate in -lclntsh" >&5
+$as_echo_n "checking for OCIEnvNlsCreate in -lclntsh... " >&6; }
+if ${ac_cv_lib_clntsh_OCIEnvNlsCreate+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lclntsh  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char OCIEnvNlsCreate (void);
+char OCIEnvNlsCreate ();
 int
-main (void)
+main ()
 {
 return OCIEnvNlsCreate ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_clntsh_OCIEnvNlsCreate=yes
-else case e in #(
-  e) ac_cv_lib_clntsh_OCIEnvNlsCreate=no ;;
-esac
+else
+  ac_cv_lib_clntsh_OCIEnvNlsCreate=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIEnvNlsCreate" >&5
-printf "%s\n" "$ac_cv_lib_clntsh_OCIEnvNlsCreate" >&6; }
-if test "x$ac_cv_lib_clntsh_OCIEnvNlsCreate" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_OCIENVNLSCREATE 1" >>confdefs.h
+$as_echo "#define HAVE_OCIENVNLSCREATE 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_clntsh_OCIEnvNlsCreate
 
-   ;;
-esac
+
 fi
 
 
@@ -63643,68 +59959,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OCIStmtFetch2 in -lclntsh" >&5
-printf %s "checking for OCIStmtFetch2 in -lclntsh... " >&6; }
-if test ${ac_cv_lib_clntsh_OCIStmtFetch2+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCIStmtFetch2 in -lclntsh" >&5
+$as_echo_n "checking for OCIStmtFetch2 in -lclntsh... " >&6; }
+if ${ac_cv_lib_clntsh_OCIStmtFetch2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lclntsh  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char OCIStmtFetch2 (void);
+char OCIStmtFetch2 ();
 int
-main (void)
+main ()
 {
 return OCIStmtFetch2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_clntsh_OCIStmtFetch2=yes
-else case e in #(
-  e) ac_cv_lib_clntsh_OCIStmtFetch2=no ;;
-esac
+else
+  ac_cv_lib_clntsh_OCIStmtFetch2=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCIStmtFetch2" >&5
-printf "%s\n" "$ac_cv_lib_clntsh_OCIStmtFetch2" >&6; }
-if test "x$ac_cv_lib_clntsh_OCIStmtFetch2" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_OCISTMTFETCH2 1" >>confdefs.h
+$as_echo "#define HAVE_OCISTMTFETCH2 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_clntsh_OCIStmtFetch2
 
-   ;;
-esac
+
 fi
 
 
@@ -63815,79 +60122,69 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OCILobRead2 in -lclntsh" >&5
-printf %s "checking for OCILobRead2 in -lclntsh... " >&6; }
-if test ${ac_cv_lib_clntsh_OCILobRead2+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OCILobRead2 in -lclntsh" >&5
+$as_echo_n "checking for OCILobRead2 in -lclntsh... " >&6; }
+if ${ac_cv_lib_clntsh_OCILobRead2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lclntsh  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char OCILobRead2 (void);
+char OCILobRead2 ();
 int
-main (void)
+main ()
 {
 return OCILobRead2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_clntsh_OCILobRead2=yes
-else case e in #(
-  e) ac_cv_lib_clntsh_OCILobRead2=no ;;
-esac
+else
+  ac_cv_lib_clntsh_OCILobRead2=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCILobRead2" >&5
-printf "%s\n" "$ac_cv_lib_clntsh_OCILobRead2" >&6; }
-if test "x$ac_cv_lib_clntsh_OCILobRead2" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_clntsh_OCILobRead2" >&5
+$as_echo "$ac_cv_lib_clntsh_OCILobRead2" >&6; }
+if test "x$ac_cv_lib_clntsh_OCILobRead2" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_OCILOBREAD2 1" >>confdefs.h
+$as_echo "#define HAVE_OCILOBREAD2 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_clntsh_OCILobRead2
 
-   ;;
-esac
+
 fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
-printf %s "checking for PDO includes... " >&6; }
-if test ${pdo_cv_inc_path+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
+if ${pdo_cv_inc_path+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     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
@@ -63895,11 +60192,10 @@
     elif test -f $phpincludedir/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$phpincludedir/ext
     fi
-   ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
-printf "%s\n" "$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
@@ -64041,7 +60337,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PDO_OCI 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PDO_OCI 1
+_ACEOF
 
     fi
   fi
@@ -64203,7 +60501,9 @@
 
 
 
-printf "%s\n" "#define PHP_PDO_OCI_CLIENT_VERSION \"$PDO_OCI_VERSION\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_PDO_OCI_CLIENT_VERSION "$PDO_OCI_VERSION"
+_ACEOF
 
 fi
 
@@ -64215,19 +60515,17 @@
 
 php_with_pdo_odbc=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ODBC v3 support for PDO" >&5
-printf %s "checking for ODBC v3 support for PDO... " >&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+y}
-then :
+if test "${with_pdo_odbc+set}" = set; then :
   withval=$with_pdo_odbc; PHP_PDO_ODBC=$withval
-else case e in #(
-  e)
+else
+
   PHP_PDO_ODBC=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_ODBC=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -64253,8 +60551,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -64268,13 +60566,12 @@
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
-printf %s "checking for PDO includes... " >&6; }
-if test ${pdo_cv_inc_path+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
+if ${pdo_cv_inc_path+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     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
@@ -64282,11 +60579,10 @@
     elif test -f $phpincludedir/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$phpincludedir/ext
     fi
-   ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
-printf "%s\n" "$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
@@ -64294,8 +60590,8 @@
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for selected PDO ODBC flavour" >&5
-printf %s "checking for selected PDO ODBC flavour... " >&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`"
@@ -64356,286 +60652,286 @@
     PDO_ODBC_LIBDIR="$pdo_odbc_def_libdir"
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$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
-printf "%s\n" "$pdo_odbc_flavour
+$as_echo "$pdo_odbc_flavour
           libs       $PDO_ODBC_LIBDIR,
           headers    $PDO_ODBC_INCDIR" >&6; }
 
   if test ! -d "$PDO_ODBC_LIBDIR" ; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: library dir $PDO_ODBC_LIBDIR does not exist" >&5
-printf "%s\n" "$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
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for odbc.h in $PDO_ODBC_INCDIR... " >&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
 
-printf "%s\n" "#define HAVE_ODBC_H 1" >>confdefs.h
+$as_echo "#define HAVE_ODBC_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for odbcsdk.h in $PDO_ODBC_INCDIR... " >&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
 
-printf "%s\n" "#define HAVE_ODBCSDK_H 1" >>confdefs.h
+$as_echo "#define HAVE_ODBCSDK_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for iodbc.h in $PDO_ODBC_INCDIR... " >&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
 
-printf "%s\n" "#define HAVE_IODBC_H 1" >>confdefs.h
+$as_echo "#define HAVE_IODBC_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for sqlunix.h in $PDO_ODBC_INCDIR... " >&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
 
-printf "%s\n" "#define HAVE_SQLUNIX_H 1" >>confdefs.h
+$as_echo "#define HAVE_SQLUNIX_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for sqltypes.h in $PDO_ODBC_INCDIR... " >&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
 
-printf "%s\n" "#define HAVE_SQLTYPES_H 1" >>confdefs.h
+$as_echo "#define HAVE_SQLTYPES_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for sqlucode.h in $PDO_ODBC_INCDIR... " >&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
 
-printf "%s\n" "#define HAVE_SQLUCODE_H 1" >>confdefs.h
+$as_echo "#define HAVE_SQLUCODE_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sql.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for sql.h in $PDO_ODBC_INCDIR... " >&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
 
-printf "%s\n" "#define HAVE_SQL_H 1" >>confdefs.h
+$as_echo "#define HAVE_SQL_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isql.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for isql.h in $PDO_ODBC_INCDIR... " >&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
 
-printf "%s\n" "#define HAVE_ISQL_H 1" >>confdefs.h
+$as_echo "#define HAVE_ISQL_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for sqlext.h in $PDO_ODBC_INCDIR... " >&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
 
-printf "%s\n" "#define HAVE_SQLEXT_H 1" >>confdefs.h
+$as_echo "#define HAVE_SQLEXT_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for isqlext.h in $PDO_ODBC_INCDIR... " >&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
 
-printf "%s\n" "#define HAVE_ISQLEXT_H 1" >>confdefs.h
+$as_echo "#define HAVE_ISQLEXT_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for udbcext.h in $PDO_ODBC_INCDIR... " >&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
 
-printf "%s\n" "#define HAVE_UDBCEXT_H 1" >>confdefs.h
+$as_echo "#define HAVE_UDBCEXT_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for sqlcli1.h in $PDO_ODBC_INCDIR... " >&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
 
-printf "%s\n" "#define HAVE_SQLCLI1_H 1" >>confdefs.h
+$as_echo "#define HAVE_SQLCLI1_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for LibraryManager.h in $PDO_ODBC_INCDIR... " >&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
 
-printf "%s\n" "#define HAVE_LIBRARYMANAGER_H 1" >>confdefs.h
+$as_echo "#define HAVE_LIBRARYMANAGER_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for cli0core.h in $PDO_ODBC_INCDIR... " >&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
 
-printf "%s\n" "#define HAVE_CLI0CORE_H 1" >>confdefs.h
+$as_echo "#define HAVE_CLI0CORE_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for cli0ext.h in $PDO_ODBC_INCDIR... " >&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
 
-printf "%s\n" "#define HAVE_CLI0EXT_H 1" >>confdefs.h
+$as_echo "#define HAVE_CLI0EXT_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for cli0cli.h in $PDO_ODBC_INCDIR... " >&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
 
-printf "%s\n" "#define HAVE_CLI0CLI_H 1" >>confdefs.h
+$as_echo "#define HAVE_CLI0CLI_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for cli0defs.h in $PDO_ODBC_INCDIR... " >&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
 
-printf "%s\n" "#define HAVE_CLI0DEFS_H 1" >>confdefs.h
+$as_echo "#define HAVE_CLI0DEFS_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
-printf %s "checking for cli0env.h in $PDO_ODBC_INCDIR... " >&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
 
-printf "%s\n" "#define HAVE_CLI0ENV_H 1" >>confdefs.h
+$as_echo "#define HAVE_CLI0ENV_H 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
@@ -64851,53 +61147,45 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$pdo_odbc_def_lib""_SQLBindCol" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5
-printf %s "checking for SQLBindCol in -l$pdo_odbc_def_lib... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  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 eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$pdo_odbc_def_lib  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char SQLBindCol (void);
+char SQLBindCol ();
 int
-main (void)
+main ()
 {
 return SQLBindCol ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -65007,60 +61295,52 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$pdo_odbc_def_lib""_SQLAllocHandle" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5
-printf %s "checking for SQLAllocHandle in -l$pdo_odbc_def_lib... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  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 eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$pdo_odbc_def_lib  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char SQLAllocHandle (void);
+char SQLAllocHandle ();
 int
-main (void)
+main ()
 {
 return SQLAllocHandle ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$pdo_odbc_def_lib_SQLAllocHandle
@@ -65071,22 +61351,20 @@
 libraries as a driver in that environment; it will emulate the
 functions required for PDO support.
 " "$LINENO" 5
-   ;;
-esac
+
 fi
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$pdo_odbc_def_lib_SQLBindCol
 
     as_fn_error $? "Your ODBC library does not exist or there was an error. Check config.log for more information" "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
 
@@ -65224,7 +61502,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PDO_ODBC 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PDO_ODBC 1
+_ACEOF
 
     fi
   fi
@@ -65375,19 +61655,17 @@
 
 php_with_pdo_pgsql=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL support for PDO" >&5
-printf %s "checking for PostgreSQL support for PDO... " >&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+y}
-then :
+if test "${with_pdo_pgsql+set}" = set; then :
   withval=$with_pdo_pgsql; PHP_PDO_PGSQL=$withval
-else case e in #(
-  e)
+else
+
   PHP_PDO_PGSQL=no
   test "$PHP_ENABLE_ALL" && PHP_PDO_PGSQL=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -65413,8 +61691,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -65437,8 +61715,8 @@
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pg_config" >&5
-printf %s "checking for pg_config... " >&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"
@@ -65447,13 +61725,13 @@
   done
 
   if test -n "$PG_CONFIG"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
-printf "%s\n" "$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`
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-printf "%s\n" "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
@@ -65489,65 +61767,58 @@
   fi
 
 
-printf "%s\n" "#define HAVE_PDO_PGSQL 1" >>confdefs.h
+$as_echo "#define HAVE_PDO_PGSQL 1" >>confdefs.h
 
 
   old_LIBS=$LIBS
   old_LDFLAGS=$LDFLAGS
   LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQlibVersion in -lpq" >&5
-printf %s "checking for PQlibVersion in -lpq... " >&6; }
-if test ${ac_cv_lib_pq_PQlibVersion+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQlibVersion in -lpq" >&5
+$as_echo_n "checking for PQlibVersion in -lpq... " >&6; }
+if ${ac_cv_lib_pq_PQlibVersion+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char PQlibVersion (void);
+char PQlibVersion ();
 int
-main (void)
+main ()
 {
 return PQlibVersion ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQlibVersion=yes
-else case e in #(
-  e) ac_cv_lib_pq_PQlibVersion=no ;;
-esac
+else
+  ac_cv_lib_pq_PQlibVersion=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQlibVersion" >&5
-printf "%s\n" "$ac_cv_lib_pq_PQlibVersion" >&6; }
-if test "x$ac_cv_lib_pq_PQlibVersion" = xyes
-then :
-  printf "%s\n" "#define HAVE_LIBPQ 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQlibVersion" >&5
+$as_echo "$ac_cv_lib_pq_PQlibVersion" >&6; }
+if test "x$ac_cv_lib_pq_PQlibVersion" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPQ 1
+_ACEOF
 
   LIBS="-lpq $LIBS"
 
-else case e in #(
-  e) as_fn_error $? "Unable to build the PDO PostgreSQL driver: at least libpq 9.1 is required" "$LINENO" 5 ;;
-esac
+else
+  as_fn_error $? "Unable to build the PDO PostgreSQL driver: at least libpq 9.1 is required" "$LINENO" 5
 fi
 
 
@@ -65688,13 +61959,12 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
-printf %s "checking for PDO includes... " >&6; }
-if test ${pdo_cv_inc_path+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
+if ${pdo_cv_inc_path+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     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
@@ -65702,11 +61972,10 @@
     elif test -f $phpincludedir/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$phpincludedir/ext
     fi
-   ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
-printf "%s\n" "$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
@@ -65848,7 +62117,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PDO_PGSQL 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PDO_PGSQL 1
+_ACEOF
 
     fi
   fi
@@ -65996,19 +62267,17 @@
 
 php_with_pdo_sqlite=$PHP_PDO
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite 3 support for PDO" >&5
-printf %s "checking for sqlite 3 support for PDO... " >&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+y}
-then :
+if test "${with_pdo_sqlite+set}" = set; then :
   withval=$with_pdo_sqlite; PHP_PDO_SQLITE=$withval
-else case e in #(
-  e)
+else
+
   PHP_PDO_SQLITE=$PHP_PDO
   test "$PHP_ENABLE_ALL" && PHP_PDO_SQLITE=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -66034,8 +62303,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -66047,13 +62316,12 @@
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
-printf %s "checking for PDO includes... " >&6; }
-if test ${pdo_cv_inc_path+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PDO includes" >&5
+$as_echo_n "checking for PDO includes... " >&6; }
+if ${pdo_cv_inc_path+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     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
@@ -66061,11 +62329,10 @@
     elif test -f $phpincludedir/ext/pdo/php_pdo_driver.h; then
       pdo_cv_inc_path=$phpincludedir/ext
     fi
-   ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $pdo_cv_inc_path" >&5
-printf "%s\n" "$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
@@ -66075,17 +62342,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3 >= 3.7.7" >&5
-printf %s "checking for sqlite3 >= 3.7.7... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3 >= 3.7.7" >&5
+$as_echo_n "checking for sqlite3 >= 3.7.7... " >&6; }
 
 if test -n "$SQLITE_CFLAGS"; then
     pkg_cv_SQLITE_CFLAGS="$SQLITE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
   ($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.7.7") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SQLITE_CFLAGS=`$PKG_CONFIG --cflags "sqlite3 >= 3.7.7" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -66099,10 +62366,10 @@
     pkg_cv_SQLITE_LIBS="$SQLITE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sqlite3 >= 3.7.7\""; } >&5
   ($PKG_CONFIG --exists --print-errors "sqlite3 >= 3.7.7") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_SQLITE_LIBS=`$PKG_CONFIG --libs "sqlite3 >= 3.7.7" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -66116,8 +62383,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -66143,10 +62410,10 @@
 and SQLITE_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -66156,12 +62423,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	SQLITE_CFLAGS=$pkg_cv_SQLITE_CFLAGS
 	SQLITE_LIBS=$pkg_cv_SQLITE_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -66305,7 +62572,7 @@
   done
 
 
-printf "%s\n" "#define HAVE_PDO_SQLITELIB 1" >>confdefs.h
+$as_echo "#define HAVE_PDO_SQLITELIB 1" >>confdefs.h
 
 
 
@@ -66413,68 +62680,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_close_v2 in -lsqlite3" >&5
-printf %s "checking for sqlite3_close_v2 in -lsqlite3... " >&6; }
-if test ${ac_cv_lib_sqlite3_sqlite3_close_v2+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_close_v2 in -lsqlite3" >&5
+$as_echo_n "checking for sqlite3_close_v2 in -lsqlite3... " >&6; }
+if ${ac_cv_lib_sqlite3_sqlite3_close_v2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char sqlite3_close_v2 (void);
+char sqlite3_close_v2 ();
 int
-main (void)
+main ()
 {
 return sqlite3_close_v2 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sqlite3_sqlite3_close_v2=yes
-else case e in #(
-  e) ac_cv_lib_sqlite3_sqlite3_close_v2=no ;;
-esac
+else
+  ac_cv_lib_sqlite3_sqlite3_close_v2=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_close_v2" >&5
-printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_close_v2" >&6; }
-if test "x$ac_cv_lib_sqlite3_sqlite3_close_v2" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_close_v2" >&5
+$as_echo "$ac_cv_lib_sqlite3_sqlite3_close_v2" >&6; }
+if test "x$ac_cv_lib_sqlite3_sqlite3_close_v2" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_SQLITE3_CLOSE_V2 1" >>confdefs.h
+$as_echo "#define HAVE_SQLITE3_CLOSE_V2 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sqlite3_sqlite3_close_v2
 
-   ;;
-esac
+
 fi
 
 
@@ -66583,68 +62841,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sqlite3_column_table_name in -lsqlite3" >&5
-printf %s "checking for sqlite3_column_table_name in -lsqlite3... " >&6; }
-if test ${ac_cv_lib_sqlite3_sqlite3_column_table_name+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_sqlite3_sqlite3_column_table_name+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsqlite3  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char sqlite3_column_table_name (void);
+char sqlite3_column_table_name ();
 int
-main (void)
+main ()
 {
 return sqlite3_column_table_name ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_sqlite3_sqlite3_column_table_name=yes
-else case e in #(
-  e) ac_cv_lib_sqlite3_sqlite3_column_table_name=no ;;
-esac
+else
+  ac_cv_lib_sqlite3_sqlite3_column_table_name=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_column_table_name" >&5
-printf "%s\n" "$ac_cv_lib_sqlite3_sqlite3_column_table_name" >&6; }
-if test "x$ac_cv_lib_sqlite3_sqlite3_column_table_name" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_SQLITE3_COLUMN_TABLE_NAME 1" >>confdefs.h
+$as_echo "#define HAVE_SQLITE3_COLUMN_TABLE_NAME 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_sqlite3_sqlite3_column_table_name
 
-   ;;
-esac
+
 fi
 
 
@@ -66785,7 +63034,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PDO_SQLITE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PDO_SQLITE 1
+_ACEOF
 
     fi
   fi
@@ -66932,377 +63183,19 @@
 
 
 
-php_enable_pdo=yes
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable PDO support" >&5
-printf %s "checking whether to enable PDO support... " >&6; }
-# Check whether --enable-pdo was given.
-if test ${enable_pdo+y}
-then :
-  enableval=$enable_pdo; PHP_PDO=$enableval
-else case e in #(
-  e)
-  PHP_PDO=yes
-  test "$PHP_ENABLE_ALL" && PHP_PDO=$PHP_ENABLE_ALL
- ;;
-esac
-fi
-
-
-
-ext_output="yes, shared"
-ext_shared=yes
-case $PHP_PDO in
-shared,*)
-  PHP_PDO=`echo "$PHP_PDO"|$SED 's/^shared,//'`
-  ;;
-shared)
-  PHP_PDO=yes
-  ;;
-no)
-  ext_output=no
-  ext_shared=no
-  ;;
-*)
-  ext_output=yes
-  ext_shared=no
-  ;;
-esac
-
-
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
-
-
-
-
-if test "$PHP_PDO" != "no"; then
-
-    PHP_PDO=yes
-
-
-  ext_builddir=ext/pdo
-  ext_srcdir=$abs_srcdir/ext/pdo
-  ext_dir=ext/pdo
-
-  ac_extra=
-
-  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
-    PHP_PDO_SHARED=no
-
-
-  case $ext_dir in
-  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
-  /*) ac_srcdir=`echo "$ext_dir"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
-  *) ac_srcdir="$abs_srcdir/$ext_dir/"; ac_bdir="$ext_dir/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
-  esac
-
-
-
-  b_c_pre=$php_c_pre
-  b_cxx_pre=$php_cxx_pre
-  b_c_meta=$php_c_meta
-  b_cxx_meta=$php_cxx_meta
-  b_c_post=$php_c_post
-  b_cxx_post=$php_cxx_post
-  b_lo=$php_lo
-
-
-  old_IFS=$IFS
-  for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
-
-      IFS=.
-      set $ac_src
-      ac_obj=$1
-      IFS=$old_IFS
-
-      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
-
-      case $ac_src in
-        *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-        *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-        *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-      esac
-
-      ac_comp="$ac_comp -MMD -MF $ac_bdir$ac_obj.dep -MT $ac_bdir$ac_obj.lo"
-
-    cat >>Makefile.objects<<EOF
--include $ac_bdir$ac_obj.dep
-$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-	$ac_comp
-EOF
-  done
-
-
-    EXT_STATIC="$EXT_STATIC pdo;$ext_dir"
-    if test "$ext_shared" != "nocli"; then
-      EXT_CLI_STATIC="$EXT_CLI_STATIC pdo;$ext_dir"
-    fi
-  else
-    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
-      PHP_PDO_SHARED=yes
-
-  case $ext_dir in
-  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
-  /*) ac_srcdir=`echo "$ext_dir"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
-  *) ac_srcdir="$abs_srcdir/$ext_dir/"; ac_bdir="$ext_dir/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
-  esac
-
-
-
-  b_c_pre=$shared_c_pre
-  b_cxx_pre=$shared_cxx_pre
-  b_c_meta=$shared_c_meta
-  b_cxx_meta=$shared_cxx_meta
-  b_c_post=$shared_c_post
-  b_cxx_post=$shared_cxx_post
-  b_lo=$shared_lo
-
-
-  old_IFS=$IFS
-  for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
-
-      IFS=.
-      set $ac_src
-      ac_obj=$1
-      IFS=$old_IFS
-
-      shared_objects_pdo="$shared_objects_pdo $ac_bdir$ac_obj.lo"
-
-      case $ac_src in
-        *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -DZEND_COMPILE_DL_EXT=1 -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-        *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -DZEND_COMPILE_DL_EXT=1 -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-        *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -DZEND_COMPILE_DL_EXT=1 -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta $ac_extra -DZEND_COMPILE_DL_EXT=1 -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-      esac
-
-      ac_comp="$ac_comp -MMD -MF $ac_bdir$ac_obj.dep -MT $ac_bdir$ac_obj.lo"
-
-    cat >>Makefile.objects<<EOF
--include $ac_bdir$ac_obj.dep
-$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-	$ac_comp
-EOF
-  done
-
-
-  install_modules="install-modules"
-  suffix=la
-
-  case $host_alias in
-    *aix*)
-      additional_flags="-Wl,-G"
-      ;;
-  esac
-
-  if test "x" = "xyes"; then
-    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/pdo.$suffix"
-  else
-    PHP_MODULES="$PHP_MODULES \$(phplibdir)/pdo.$suffix"
-  fi
-
-  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pdo"
-
-  cat >>Makefile.objects<<EOF
-\$(phplibdir)/pdo.$suffix: $ext_builddir/pdo.$suffix
-	\$(LIBTOOL) --tag=CC --mode=install cp $ext_builddir/pdo.$suffix \$(phplibdir)
-
-$ext_builddir/pdo.$suffix: \$(shared_objects_pdo) \$(PDO_SHARED_DEPENDENCIES)
-	\$(LIBTOOL) --tag=CC --mode=link \$(CC) -shared \$(COMMON_FLAGS) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) $additional_flags -o \$@ -export-dynamic -avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) \$(shared_objects_pdo) \$(PDO_SHARED_LIBADD)
-
-EOF
-
-
-printf "%s\n" "#define COMPILE_DL_PDO 1" >>confdefs.h
-
-    fi
-  fi
-
-  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
-    PHP_PDO_SHARED=no
-    case "$PHP_SAPI" in
-      cgi|embed|phpdbg)
-
-
-  case $ext_dir in
-  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
-  /*) ac_srcdir=`echo "$ext_dir"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
-  *) ac_srcdir="$abs_srcdir/$ext_dir/"; ac_bdir="$ext_dir/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
-  esac
-
-
-
-  b_c_pre=$php_c_pre
-  b_cxx_pre=$php_cxx_pre
-  b_c_meta=$php_c_meta
-  b_cxx_meta=$php_cxx_meta
-  b_c_post=$php_c_post
-  b_cxx_post=$php_cxx_post
-  b_lo=$php_lo
-
-
-  old_IFS=$IFS
-  for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
-
-      IFS=.
-      set $ac_src
-      ac_obj=$1
-      IFS=$old_IFS
-
-      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
-
-      case $ac_src in
-        *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-        *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-        *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-      esac
-
-      ac_comp="$ac_comp -MMD -MF $ac_bdir$ac_obj.dep -MT $ac_bdir$ac_obj.lo"
-
-    cat >>Makefile.objects<<EOF
--include $ac_bdir$ac_obj.dep
-$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-	$ac_comp
-EOF
-  done
-
-
-        EXT_STATIC="$EXT_STATIC pdo;$ext_dir"
-        ;;
-      *)
-
-
-  case $ext_dir in
-  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
-  /*) ac_srcdir=`echo "$ext_dir"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
-  *) ac_srcdir="$abs_srcdir/$ext_dir/"; ac_bdir="$ext_dir/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
-  esac
-
-
-
-  b_c_pre=$php_c_pre
-  b_cxx_pre=$php_cxx_pre
-  b_c_meta=$php_c_meta
-  b_cxx_meta=$php_cxx_meta
-  b_c_post=$php_c_post
-  b_cxx_post=$php_cxx_post
-  b_lo=$php_lo
-
-
-  old_IFS=$IFS
-  for ac_src in pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c; do
-
-      IFS=.
-      set $ac_src
-      ac_obj=$1
-      IFS=$old_IFS
-
-      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
-
-      case $ac_src in
-        *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-        *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-        *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
-        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta $ac_extra -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
-      esac
-
-      ac_comp="$ac_comp -MMD -MF $ac_bdir$ac_obj.dep -MT $ac_bdir$ac_obj.lo"
-
-    cat >>Makefile.objects<<EOF
--include $ac_bdir$ac_obj.dep
-$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
-	$ac_comp
-EOF
-  done
-
-
-        ;;
-    esac
-    EXT_CLI_STATIC="$EXT_CLI_STATIC pdo;$ext_dir"
-  fi
-
-
-    BUILD_DIR="$BUILD_DIR $ext_builddir"
-
-
-
-  if test "$ext_builddir" = "."; then
-    PHP_PECL_EXTENSION=pdo
-
-  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
-
-  fi
-
-
-  am_i_shared=$PHP_PDO_SHARED
-  is_it_shared=$PHP_SPL_SHARED
-  is_it_enabled=$PHP_SPL
-  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
-    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.
-" "$LINENO" 5
-  fi
-  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
-    as_fn_error $? "
-You've configured extension pdo, which depends on extension spl,
-but you've either not enabled spl, or have disabled it.
-" "$LINENO" 5
-  fi
-
-
-
-    header_path=ext/pdo
-    for header_file in php_pdo.h php_pdo_driver.h php_pdo_error.h; do
-      hp_hf="$header_path/$header_file"
-
-
-  unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'`
-
-  cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\""
-  if test -n "$unique" && test "`eval $cmd`" = "" ; then
-    eval "INSTALLHEADERS$unique=set"
-
-        INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf"
-
-  fi
-
-    done
-
-
-
-
-  src=$ext_srcdir/Makefile.frag
-  ac_srcdir=$ext_srcdir
-  ac_builddir=$ext_builddir
-  test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src  >> Makefile.fragments
-
-fi
-
-
-
-
-
 php_with_pgsql=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PostgreSQL support" >&5
-printf %s "checking for PostgreSQL support... " >&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+y}
-then :
+if test "${with_pgsql+set}" = set; then :
   withval=$with_pgsql; PHP_PGSQL=$withval
-else case e in #(
-  e)
+else
+
   PHP_PGSQL=no
   test "$PHP_ENABLE_ALL" && PHP_PGSQL=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -67328,8 +63221,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -67348,8 +63241,8 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pg_config" >&5
-printf %s "checking for pg_config... " >&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"
@@ -67358,13 +63251,13 @@
   done
 
   if test -n "$PG_CONFIG"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PG_CONFIG" >&5
-printf "%s\n" "$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`
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-printf "%s\n" "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
@@ -67400,162 +63293,139 @@
   fi
 
 
-printf "%s\n" "#define HAVE_PGSQL 1" >>confdefs.h
+$as_echo "#define HAVE_PGSQL 1" >>confdefs.h
 
   old_LIBS=$LIBS
   old_LDFLAGS=$LDFLAGS
   LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PQlibVersion in -lpq" >&5
-printf %s "checking for PQlibVersion in -lpq... " >&6; }
-if test ${ac_cv_lib_pq_PQlibVersion+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQlibVersion in -lpq" >&5
+$as_echo_n "checking for PQlibVersion in -lpq... " >&6; }
+if ${ac_cv_lib_pq_PQlibVersion+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char PQlibVersion (void);
+char PQlibVersion ();
 int
-main (void)
+main ()
 {
 return PQlibVersion ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_PQlibVersion=yes
-else case e in #(
-  e) ac_cv_lib_pq_PQlibVersion=no ;;
-esac
+else
+  ac_cv_lib_pq_PQlibVersion=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQlibVersion" >&5
-printf "%s\n" "$ac_cv_lib_pq_PQlibVersion" >&6; }
-if test "x$ac_cv_lib_pq_PQlibVersion" = xyes
-then :
-  printf "%s\n" "#define HAVE_LIBPQ 1" >>confdefs.h
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_PQlibVersion" >&5
+$as_echo "$ac_cv_lib_pq_PQlibVersion" >&6; }
+if test "x$ac_cv_lib_pq_PQlibVersion" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBPQ 1
+_ACEOF
 
   LIBS="-lpq $LIBS"
 
-else case e in #(
-  e) as_fn_error $? "Unable to build the PostgreSQL extension: at least libpq 9.1 is required" "$LINENO" 5 ;;
-esac
+else
+  as_fn_error $? "Unable to build the PostgreSQL extension: at least libpq 9.1 is required" "$LINENO" 5
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pg_encoding_to_char in -lpq" >&5
-printf %s "checking for pg_encoding_to_char in -lpq... " >&6; }
-if test ${ac_cv_lib_pq_pg_encoding_to_char+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_pq_pg_encoding_to_char+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char pg_encoding_to_char (void);
+char pg_encoding_to_char ();
 int
-main (void)
+main ()
 {
 return pg_encoding_to_char ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_pg_encoding_to_char=yes
-else case e in #(
-  e) ac_cv_lib_pq_pg_encoding_to_char=no ;;
-esac
+else
+  ac_cv_lib_pq_pg_encoding_to_char=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_pg_encoding_to_char" >&5
-printf "%s\n" "$ac_cv_lib_pq_pg_encoding_to_char" >&6; }
-if test "x$ac_cv_lib_pq_pg_encoding_to_char" = xyes
-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" = xyes; then :
 
-printf "%s\n" "#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1" >>confdefs.h
+$as_echo "#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1" >>confdefs.h
 
 fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lo_truncate64 in -lpq" >&5
-printf %s "checking for lo_truncate64 in -lpq... " >&6; }
-if test ${ac_cv_lib_pq_lo_truncate64+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lo_truncate64 in -lpq" >&5
+$as_echo_n "checking for lo_truncate64 in -lpq... " >&6; }
+if ${ac_cv_lib_pq_lo_truncate64+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lpq  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char lo_truncate64 (void);
+char lo_truncate64 ();
 int
-main (void)
+main ()
 {
 return lo_truncate64 ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_pq_lo_truncate64=yes
-else case e in #(
-  e) ac_cv_lib_pq_lo_truncate64=no ;;
-esac
+else
+  ac_cv_lib_pq_lo_truncate64=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_lo_truncate64" >&5
-printf "%s\n" "$ac_cv_lib_pq_lo_truncate64" >&6; }
-if test "x$ac_cv_lib_pq_lo_truncate64" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pq_lo_truncate64" >&5
+$as_echo "$ac_cv_lib_pq_lo_truncate64" >&6; }
+if test "x$ac_cv_lib_pq_lo_truncate64" = xyes; then :
 
-printf "%s\n" "#define HAVE_PG_LO64 1" >>confdefs.h
+$as_echo "#define HAVE_PG_LO64 1" >>confdefs.h
 
 fi
 
@@ -67829,7 +63699,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PGSQL 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PGSQL 1
+_ACEOF
 
     fi
   fi
@@ -67958,18 +63830,16 @@
 
 php_enable_phar=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phar archive support" >&5
-printf %s "checking for phar archive support... " >&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+y}
-then :
+if test "${enable_phar+set}" = set; then :
   enableval=$enable_phar; PHP_PHAR=$enableval
-else case e in #(
-  e)
+else
+
   PHP_PHAR=yes
   test "$PHP_ENABLE_ALL" && PHP_PHAR=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -67995,8 +63865,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -68136,7 +64006,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PHAR 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PHAR 1
+_ACEOF
 
     fi
   fi
@@ -68257,21 +64129,21 @@
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for phar openssl support" >&5
-printf %s "checking for phar openssl support... " >&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_OPENSSL_SHARED" = "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (shared openssl)" >&5
-printf "%s\n" "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
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define PHAR_HAVE_OPENSSL 1" >>confdefs.h
+$as_echo "#define PHAR_HAVE_OPENSSL 1" >>confdefs.h
 
     else
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     fi
   fi
 
@@ -68351,18 +64223,16 @@
 
 php_enable_posix=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable POSIX-like functions" >&5
-printf %s "checking whether to enable POSIX-like functions... " >&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+y}
-then :
+if test "${enable_posix+set}" = set; then :
   enableval=$enable_posix; PHP_POSIX=$enableval
-else case e in #(
-  e)
+else
+
   PHP_POSIX=yes
   test "$PHP_ENABLE_ALL" && PHP_POSIX=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -68388,15 +64258,15 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_POSIX 1" >>confdefs.h
+$as_echo "#define HAVE_POSIX 1" >>confdefs.h
 
 
   ext_builddir=ext/posix
@@ -68532,7 +64402,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_POSIX 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_POSIX 1
+_ACEOF
 
     fi
   fi
@@ -68654,116 +64526,42 @@
   fi
 
 
-  ac_fn_c_check_header_compile "$LINENO" "sys/mkdev.h" "ac_cv_header_sys_mkdev_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_mkdev_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_MKDEV_H 1" >>confdefs.h
-
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/sysmacros.h" "ac_cv_header_sys_sysmacros_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sysmacros_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_SYSMACROS_H 1" >>confdefs.h
-
-fi
-
-
-  ac_fn_c_check_func "$LINENO" "seteuid" "ac_cv_func_seteuid"
-if test "x$ac_cv_func_seteuid" = xyes
-then :
-  printf "%s\n" "#define HAVE_SETEUID 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "setegid" "ac_cv_func_setegid"
-if test "x$ac_cv_func_setegid" = xyes
-then :
-  printf "%s\n" "#define HAVE_SETEGID 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "setsid" "ac_cv_func_setsid"
-if test "x$ac_cv_func_setsid" = xyes
-then :
-  printf "%s\n" "#define HAVE_SETSID 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getsid" "ac_cv_func_getsid"
-if test "x$ac_cv_func_getsid" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETSID 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getpgid" "ac_cv_func_getpgid"
-if test "x$ac_cv_func_getpgid" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETPGID 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "ctermid" "ac_cv_func_ctermid"
-if test "x$ac_cv_func_ctermid" = xyes
-then :
-  printf "%s\n" "#define HAVE_CTERMID 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "mkfifo" "ac_cv_func_mkfifo"
-if test "x$ac_cv_func_mkfifo" = xyes
-then :
-  printf "%s\n" "#define HAVE_MKFIFO 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "mknod" "ac_cv_func_mknod"
-if test "x$ac_cv_func_mknod" = xyes
-then :
-  printf "%s\n" "#define HAVE_MKNOD 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "setrlimit" "ac_cv_func_setrlimit"
-if test "x$ac_cv_func_setrlimit" = xyes
-then :
-  printf "%s\n" "#define HAVE_SETRLIMIT 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "getrlimit" "ac_cv_func_getrlimit"
-if test "x$ac_cv_func_getrlimit" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETRLIMIT 1" >>confdefs.h
+  for ac_header in sys/mkdev.h sys/sysmacros.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
 fi
-ac_fn_c_check_func "$LINENO" "getgroups" "ac_cv_func_getgroups"
-if test "x$ac_cv_func_getgroups" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETGROUPS 1" >>confdefs.h
 
-fi
-ac_fn_c_check_func "$LINENO" "makedev" "ac_cv_func_makedev"
-if test "x$ac_cv_func_makedev" = xyes
-then :
-  printf "%s\n" "#define HAVE_MAKEDEV 1" >>confdefs.h
+done
 
-fi
-ac_fn_c_check_func "$LINENO" "initgroups" "ac_cv_func_initgroups"
-if test "x$ac_cv_func_initgroups" = xyes
-then :
-  printf "%s\n" "#define HAVE_INITGROUPS 1" >>confdefs.h
 
-fi
-ac_fn_c_check_func "$LINENO" "getgrgid_r" "ac_cv_func_getgrgid_r"
-if test "x$ac_cv_func_getgrgid_r" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETGRGID_R 1" >>confdefs.h
+  for ac_func in seteuid setegid setsid getsid getpgid ctermid mkfifo mknod setrlimit getrlimit getgroups makedev initgroups 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"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
+done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working ttyname_r() implementation" >&5
-printf %s "checking for working ttyname_r() implementation... " >&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 :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" >&5
-printf "%s\n" "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 case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <unistd.h>
@@ -68776,35 +64574,31 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define HAVE_TTYNAME_R 1" >>confdefs.h
+$as_echo "#define HAVE_TTYNAME_R 1" >>confdefs.h
 
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, posix_ttyname() will be thread-unsafe" >&5
-printf "%s\n" "no, posix_ttyname() will be thread-unsafe" >&6; }
-   ;;
-esac
+else
+
+    { $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.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for utsname.domainname" >&5
-printf %s "checking for utsname.domainname... " >&6; }
-if test ${ac_cv_have_utsname_domainname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for utsname.domainname" >&5
+$as_echo_n "checking for utsname.domainname... " >&6; }
+if ${ac_cv_have_utsname_domainname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -68812,7 +64606,7 @@
       #include <sys/utsname.h>
 
 int
-main (void)
+main ()
 {
 
       return sizeof(((struct utsname *)0)->domainname);
@@ -68821,26 +64615,23 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
       ac_cv_have_utsname_domainname=yes
 
-else case e in #(
-  e)
+else
+
       ac_cv_have_utsname_domainname=no
-     ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have_utsname_domainname" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_UTSNAME_DOMAINNAME 1" >>confdefs.h
+$as_echo "#define HAVE_UTSNAME_DOMAINNAME 1" >>confdefs.h
 
   fi
 fi
@@ -68851,19 +64642,17 @@
 
 php_with_pspell=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for PSPELL support" >&5
-printf %s "checking for PSPELL support... " >&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+y}
-then :
+if test "${with_pspell+set}" = set; then :
   withval=$with_pspell; PHP_PSPELL=$withval
-else case e in #(
-  e)
+else
+
   PHP_PSPELL=no
   test "$PHP_ENABLE_ALL" && PHP_PSPELL=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -68889,8 +64678,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -69030,7 +64819,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_PSPELL 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_PSPELL 1
+_ACEOF
 
     fi
   fi
@@ -69377,51 +65168,43 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for new_aspell_config in -laspell" >&5
-printf %s "checking for new_aspell_config in -laspell... " >&6; }
-if test ${ac_cv_lib_aspell_new_aspell_config+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_aspell_new_aspell_config+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-laspell  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char new_aspell_config (void);
+char new_aspell_config ();
 int
-main (void)
+main ()
 {
 return new_aspell_config ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_aspell_new_aspell_config=yes
-else case e in #(
-  e) ac_cv_lib_aspell_new_aspell_config=no ;;
-esac
+else
+  ac_cv_lib_aspell_new_aspell_config=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_aspell_new_aspell_config" >&5
-printf "%s\n" "$ac_cv_lib_aspell_new_aspell_config" >&6; }
-if test "x$ac_cv_lib_aspell_new_aspell_config" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -69525,14 +65308,13 @@
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_aspell_new_aspell_config
 
-   ;;
-esac
+
 fi
 
 
@@ -69571,43 +65353,53 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST PSPELL_SHARED_LIBADD"
 
 
-printf "%s\n" "#define HAVE_PSPELL 1" >>confdefs.h
+$as_echo "#define HAVE_PSPELL 1" >>confdefs.h
 
 fi
 
 
 
 
-ac_fn_check_decl "$LINENO" "arc4random_buf" "ac_cv_have_decl_arc4random_buf" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_arc4random_buf" = xyes
-then :
+ac_fn_c_check_decl "$LINENO" "arc4random_buf" "ac_cv_have_decl_arc4random_buf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_arc4random_buf" = xyes; then :
   ac_have_decl=1
-else case e in #(
-  e) ac_have_decl=0 ;;
-esac
+else
+  ac_have_decl=0
 fi
-printf "%s\n" "#define HAVE_DECL_ARC4RANDOM_BUF $ac_have_decl" >>confdefs.h
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ARC4RANDOM_BUF $ac_have_decl
+_ACEOF
 
 
-ac_fn_c_check_header_compile "$LINENO" "CommonCrypto/CommonRandom.h" "ac_cv_header_CommonCrypto_CommonRandom_h" "
+for ac_header in CommonCrypto/CommonRandom.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "CommonCrypto/CommonRandom.h" "ac_cv_header_CommonCrypto_CommonRandom_h" "
 	#include <sys/types.h>
 	#include <Availability.h>
 	#include <CommonCrypto/CommonCryptoError.h>
 
 "
-if test "x$ac_cv_header_CommonCrypto_CommonRandom_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_COMMONCRYPTO_COMMONRANDOM_H 1" >>confdefs.h
+if test "x$ac_cv_header_CommonCrypto_CommonRandom_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_COMMONCRYPTO_COMMONRANDOM_H 1
+_ACEOF
 
 fi
 
+done
+
 
-ac_fn_c_check_func "$LINENO" "getrandom" "ac_cv_func_getrandom"
-if test "x$ac_cv_func_getrandom" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETRANDOM 1" >>confdefs.h
+for ac_func in getrandom
+do :
+  ac_fn_c_check_func "$LINENO" "getrandom" "ac_cv_func_getrandom"
+if test "x$ac_cv_func_getrandom" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GETRANDOM 1
+_ACEOF
 
 fi
+done
 
 
 
@@ -69758,7 +65550,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_RANDOM 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_RANDOM 1
+_ACEOF
 
     fi
   fi
@@ -69920,19 +65714,17 @@
 
 php_with_libedit=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libedit readline replacement" >&5
-printf %s "checking for libedit readline replacement... " >&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+y}
-then :
+if test "${with_libedit+set}" = set; then :
   withval=$with_libedit; PHP_LIBEDIT=$withval
-else case e in #(
-  e)
+else
+
   PHP_LIBEDIT=no
   test "$PHP_ENABLE_ALL" && PHP_LIBEDIT=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -69958,8 +65750,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -69968,19 +65760,17 @@
 
 php_with_readline=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline support" >&5
-printf %s "checking for readline support... " >&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+y}
-then :
+if test "${with_readline+set}" = set; then :
   withval=$with_readline; PHP_READLINE=$withval
-else case e in #(
-  e)
+else
+
   PHP_READLINE=no
   test "$PHP_ENABLE_ALL" && PHP_READLINE=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -70006,8 +65796,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -70057,51 +65847,43 @@
 
 
   PHP_READLINE_LIBS=""
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
-printf %s "checking for tgetent in -lncurses... " >&6; }
-if test ${ac_cv_lib_ncurses_tgetent+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
+$as_echo_n "checking for tgetent in -lncurses... " >&6; }
+if ${ac_cv_lib_ncurses_tgetent+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lncurses  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char tgetent (void);
+char tgetent ();
 int
-main (void)
+main ()
 {
 return tgetent ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ncurses_tgetent=yes
-else case e in #(
-  e) ac_cv_lib_ncurses_tgetent=no ;;
-esac
+else
+  ac_cv_lib_ncurses_tgetent=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
-printf "%s\n" "$ac_cv_lib_ncurses_tgetent" >&6; }
-if test "x$ac_cv_lib_ncurses_tgetent" = xyes
-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" = xyes; then :
 
 
 
@@ -70128,53 +65910,45 @@
 
     PHP_READLINE_LIBS="$PHP_READLINE_LIBS -lncurses"
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
-printf %s "checking for tgetent in -ltermcap... " >&6; }
-if test ${ac_cv_lib_termcap_tgetent+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
+$as_echo_n "checking for tgetent in -ltermcap... " >&6; }
+if ${ac_cv_lib_termcap_tgetent+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char tgetent (void);
+char tgetent ();
 int
-main (void)
+main ()
 {
 return tgetent ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_termcap_tgetent=yes
-else case e in #(
-  e) ac_cv_lib_termcap_tgetent=no ;;
-esac
+else
+  ac_cv_lib_termcap_tgetent=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
-printf "%s\n" "$ac_cv_lib_termcap_tgetent" >&6; }
-if test "x$ac_cv_lib_termcap_tgetent" = xyes
-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" = xyes; then :
 
 
 
@@ -70203,8 +65977,7 @@
 
 fi
 
-   ;;
-esac
+
 fi
 
 
@@ -70315,51 +66088,43 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
-printf %s "checking for readline in -lreadline... " >&6; }
-if test ${ac_cv_lib_readline_readline+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -lreadline" >&5
+$as_echo_n "checking for readline in -lreadline... " >&6; }
+if ${ac_cv_lib_readline_readline+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char readline (void);
+char readline ();
 int
-main (void)
+main ()
 {
 return readline ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_readline_readline=yes
-else case e in #(
-  e) ac_cv_lib_readline_readline=no ;;
-esac
+else
+  ac_cv_lib_readline_readline=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_readline" >&5
-printf "%s\n" "$ac_cv_lib_readline_readline" >&6; }
-if test "x$ac_cv_lib_readline_readline" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
@@ -70463,16 +66228,15 @@
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_readline_readline
 
     as_fn_error $? "readline library not found" "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
 
@@ -70583,66 +66347,57 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_pending_input in -lreadline" >&5
-printf %s "checking for rl_pending_input in -lreadline... " >&6; }
-if test ${ac_cv_lib_readline_rl_pending_input+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_readline_rl_pending_input+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char rl_pending_input (void);
+char rl_pending_input ();
 int
-main (void)
+main ()
 {
 return rl_pending_input ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_readline_rl_pending_input=yes
-else case e in #(
-  e) ac_cv_lib_readline_rl_pending_input=no ;;
-esac
+else
+  ac_cv_lib_readline_rl_pending_input=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_pending_input" >&5
-printf "%s\n" "$ac_cv_lib_readline_rl_pending_input" >&6; }
-if test "x$ac_cv_lib_readline_rl_pending_input" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_readline_rl_pending_input
 
     as_fn_error $? "invalid readline installation detected. Try --with-libedit instead." "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
 
@@ -70753,68 +66508,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char in -lreadline" >&5
-printf %s "checking for rl_callback_read_char in -lreadline... " >&6; }
-if test ${ac_cv_lib_readline_rl_callback_read_char+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_readline_rl_callback_read_char+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char rl_callback_read_char (void);
+char rl_callback_read_char ();
 int
-main (void)
+main ()
 {
 return rl_callback_read_char ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_readline_rl_callback_read_char=yes
-else case e in #(
-  e) ac_cv_lib_readline_rl_callback_read_char=no ;;
-esac
+else
+  ac_cv_lib_readline_rl_callback_read_char=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_callback_read_char" >&5
-printf "%s\n" "$ac_cv_lib_readline_rl_callback_read_char" >&6; }
-if test "x$ac_cv_lib_readline_rl_callback_read_char" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_RL_CALLBACK_READ_CHAR 1" >>confdefs.h
+$as_echo "#define HAVE_RL_CALLBACK_READ_CHAR 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_readline_rl_callback_read_char
 
-   ;;
-esac
+
 fi
 
 
@@ -70925,68 +66671,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_on_new_line in -lreadline" >&5
-printf %s "checking for rl_on_new_line in -lreadline... " >&6; }
-if test ${ac_cv_lib_readline_rl_on_new_line+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_on_new_line in -lreadline" >&5
+$as_echo_n "checking for rl_on_new_line in -lreadline... " >&6; }
+if ${ac_cv_lib_readline_rl_on_new_line+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char rl_on_new_line (void);
+char rl_on_new_line ();
 int
-main (void)
+main ()
 {
 return rl_on_new_line ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_readline_rl_on_new_line=yes
-else case e in #(
-  e) ac_cv_lib_readline_rl_on_new_line=no ;;
-esac
+else
+  ac_cv_lib_readline_rl_on_new_line=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_on_new_line" >&5
-printf "%s\n" "$ac_cv_lib_readline_rl_on_new_line" >&6; }
-if test "x$ac_cv_lib_readline_rl_on_new_line" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_on_new_line" >&5
+$as_echo "$ac_cv_lib_readline_rl_on_new_line" >&6; }
+if test "x$ac_cv_lib_readline_rl_on_new_line" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_RL_ON_NEW_LINE 1" >>confdefs.h
+$as_echo "#define HAVE_RL_ON_NEW_LINE 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_readline_rl_on_new_line
 
-   ;;
-esac
+
 fi
 
 
@@ -71097,97 +66834,88 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5
-printf %s "checking for rl_completion_matches in -lreadline... " >&6; }
-if test ${ac_cv_lib_readline_rl_completion_matches+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5
+$as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; }
+if ${ac_cv_lib_readline_rl_completion_matches+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char rl_completion_matches (void);
+char rl_completion_matches ();
 int
-main (void)
+main ()
 {
 return rl_completion_matches ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_readline_rl_completion_matches=yes
-else case e in #(
-  e) ac_cv_lib_readline_rl_completion_matches=no ;;
-esac
+else
+  ac_cv_lib_readline_rl_completion_matches=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_matches" >&5
-printf "%s\n" "$ac_cv_lib_readline_rl_completion_matches" >&6; }
-if test "x$ac_cv_lib_readline_rl_completion_matches" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_completion_matches" >&5
+$as_echo "$ac_cv_lib_readline_rl_completion_matches" >&6; }
+if test "x$ac_cv_lib_readline_rl_completion_matches" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h
+$as_echo "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_readline_rl_completion_matches
 
-   ;;
-esac
+
 fi
 
 
 
-printf "%s\n" "#define HAVE_HISTORY_LIST 1" >>confdefs.h
+$as_echo "#define HAVE_HISTORY_LIST 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBREADLINE 1" >>confdefs.h
+$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h
 
 
 elif test "$PHP_LIBEDIT" != "no"; then
   if test "$PHP_LIBEDIT" != "yes"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libedit directory ignored, rely on pkg-config" >&5
-printf "%s\n" "$as_me: WARNING: libedit directory ignored, rely on pkg-config" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libedit directory ignored, rely on pkg-config" >&5
+$as_echo "$as_me: WARNING: libedit directory ignored, rely on pkg-config" >&2;}
   fi
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libedit" >&5
-printf %s "checking for libedit... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libedit" >&5
+$as_echo_n "checking for libedit... " >&6; }
 
 if test -n "$EDIT_CFLAGS"; then
     pkg_cv_EDIT_CFLAGS="$EDIT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libedit") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EDIT_CFLAGS=`$PKG_CONFIG --cflags "libedit" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -71201,10 +66929,10 @@
     pkg_cv_EDIT_LIBS="$EDIT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedit\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libedit") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EDIT_LIBS=`$PKG_CONFIG --libs "libedit" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -71218,8 +66946,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -71245,10 +66973,10 @@
 and EDIT_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -71258,12 +66986,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	EDIT_CFLAGS=$pkg_cv_EDIT_CFLAGS
 	EDIT_LIBS=$pkg_cv_EDIT_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -71406,51 +67134,43 @@
   done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
-printf %s "checking for tgetent in -lncurses... " >&6; }
-if test ${ac_cv_lib_ncurses_tgetent+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -lncurses" >&5
+$as_echo_n "checking for tgetent in -lncurses... " >&6; }
+if ${ac_cv_lib_ncurses_tgetent+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lncurses  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char tgetent (void);
+char tgetent ();
 int
-main (void)
+main ()
 {
 return tgetent ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_ncurses_tgetent=yes
-else case e in #(
-  e) ac_cv_lib_ncurses_tgetent=no ;;
-esac
+else
+  ac_cv_lib_ncurses_tgetent=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_tgetent" >&5
-printf "%s\n" "$ac_cv_lib_ncurses_tgetent" >&6; }
-if test "x$ac_cv_lib_ncurses_tgetent" = xyes
-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" = xyes; then :
 
 
 
@@ -71476,53 +67196,45 @@
 
 
 
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
-printf %s "checking for tgetent in -ltermcap... " >&6; }
-if test ${ac_cv_lib_termcap_tgetent+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -ltermcap" >&5
+$as_echo_n "checking for tgetent in -ltermcap... " >&6; }
+if ${ac_cv_lib_termcap_tgetent+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltermcap  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char tgetent (void);
+char tgetent ();
 int
-main (void)
+main ()
 {
 return tgetent ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_termcap_tgetent=yes
-else case e in #(
-  e) ac_cv_lib_termcap_tgetent=no ;;
-esac
+else
+  ac_cv_lib_termcap_tgetent=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_termcap_tgetent" >&5
-printf "%s\n" "$ac_cv_lib_termcap_tgetent" >&6; }
-if test "x$ac_cv_lib_termcap_tgetent" = xyes
-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" = xyes; then :
 
 
 
@@ -71550,8 +67262,7 @@
 
 fi
 
-   ;;
-esac
+
 fi
 
 
@@ -71662,67 +67373,58 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5
-printf %s "checking for readline in -ledit... " >&6; }
-if test ${ac_cv_lib_edit_readline+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline in -ledit" >&5
+$as_echo_n "checking for readline in -ledit... " >&6; }
+if ${ac_cv_lib_edit_readline+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char readline (void);
+char readline ();
 int
-main (void)
+main ()
 {
 return readline ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_edit_readline=yes
-else case e in #(
-  e) ac_cv_lib_edit_readline=no ;;
-esac
+else
+  ac_cv_lib_edit_readline=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_readline" >&5
-printf "%s\n" "$ac_cv_lib_edit_readline" >&6; }
-if test "x$ac_cv_lib_edit_readline" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_edit_readline
 
     as_fn_error $? "edit library required by readline not found" "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
 
@@ -71833,68 +67535,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_callback_read_char in -ledit" >&5
-printf %s "checking for rl_callback_read_char in -ledit... " >&6; }
-if test ${ac_cv_lib_edit_rl_callback_read_char+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_edit_rl_callback_read_char+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char rl_callback_read_char (void);
+char rl_callback_read_char ();
 int
-main (void)
+main ()
 {
 return rl_callback_read_char ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_edit_rl_callback_read_char=yes
-else case e in #(
-  e) ac_cv_lib_edit_rl_callback_read_char=no ;;
-esac
+else
+  ac_cv_lib_edit_rl_callback_read_char=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_callback_read_char" >&5
-printf "%s\n" "$ac_cv_lib_edit_rl_callback_read_char" >&6; }
-if test "x$ac_cv_lib_edit_rl_callback_read_char" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_RL_CALLBACK_READ_CHAR 1" >>confdefs.h
+$as_echo "#define HAVE_RL_CALLBACK_READ_CHAR 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_edit_rl_callback_read_char
 
-   ;;
-esac
+
 fi
 
 
@@ -72005,68 +67698,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_on_new_line in -ledit" >&5
-printf %s "checking for rl_on_new_line in -ledit... " >&6; }
-if test ${ac_cv_lib_edit_rl_on_new_line+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_edit_rl_on_new_line+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char rl_on_new_line (void);
+char rl_on_new_line ();
 int
-main (void)
+main ()
 {
 return rl_on_new_line ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_edit_rl_on_new_line=yes
-else case e in #(
-  e) ac_cv_lib_edit_rl_on_new_line=no ;;
-esac
+else
+  ac_cv_lib_edit_rl_on_new_line=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_on_new_line" >&5
-printf "%s\n" "$ac_cv_lib_edit_rl_on_new_line" >&6; }
-if test "x$ac_cv_lib_edit_rl_on_new_line" = xyes
-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" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_RL_ON_NEW_LINE 1" >>confdefs.h
+$as_echo "#define HAVE_RL_ON_NEW_LINE 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_edit_rl_on_new_line
 
-   ;;
-esac
+
 fi
 
 
@@ -72177,68 +67861,59 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -ledit" >&5
-printf %s "checking for rl_completion_matches in -ledit... " >&6; }
-if test ${ac_cv_lib_edit_rl_completion_matches+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -ledit" >&5
+$as_echo_n "checking for rl_completion_matches in -ledit... " >&6; }
+if ${ac_cv_lib_edit_rl_completion_matches+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char rl_completion_matches (void);
+char rl_completion_matches ();
 int
-main (void)
+main ()
 {
 return rl_completion_matches ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_edit_rl_completion_matches=yes
-else case e in #(
-  e) ac_cv_lib_edit_rl_completion_matches=no ;;
-esac
+else
+  ac_cv_lib_edit_rl_completion_matches=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_completion_matches" >&5
-printf "%s\n" "$ac_cv_lib_edit_rl_completion_matches" >&6; }
-if test "x$ac_cv_lib_edit_rl_completion_matches" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_rl_completion_matches" >&5
+$as_echo "$ac_cv_lib_edit_rl_completion_matches" >&6; }
+if test "x$ac_cv_lib_edit_rl_completion_matches" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h
+$as_echo "#define HAVE_RL_COMPLETION_MATCHES 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_edit_rl_completion_matches
 
-   ;;
-esac
+
 fi
 
 
@@ -72349,73 +68024,64 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for history_list in -ledit" >&5
-printf %s "checking for history_list in -ledit... " >&6; }
-if test ${ac_cv_lib_edit_history_list+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for history_list in -ledit" >&5
+$as_echo_n "checking for history_list in -ledit... " >&6; }
+if ${ac_cv_lib_edit_history_list+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ledit  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char history_list (void);
+char history_list ();
 int
-main (void)
+main ()
 {
 return history_list ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_edit_history_list=yes
-else case e in #(
-  e) ac_cv_lib_edit_history_list=no ;;
-esac
+else
+  ac_cv_lib_edit_history_list=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_history_list" >&5
-printf "%s\n" "$ac_cv_lib_edit_history_list" >&6; }
-if test "x$ac_cv_lib_edit_history_list" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_edit_history_list" >&5
+$as_echo "$ac_cv_lib_edit_history_list" >&6; }
+if test "x$ac_cv_lib_edit_history_list" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_HISTORY_LIST 1" >>confdefs.h
+$as_echo "#define HAVE_HISTORY_LIST 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_edit_history_list
 
-   ;;
-esac
+
 fi
 
 
 
-printf "%s\n" "#define HAVE_LIBEDIT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBEDIT 1" >>confdefs.h
 
 fi
 
@@ -72554,7 +68220,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_READLINE 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_READLINE 1
+_ACEOF
 
     fi
   fi
@@ -72817,7 +68485,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_REFLECTION 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_REFLECTION 1
+_ACEOF
 
     fi
   fi
@@ -72945,18 +68615,16 @@
 
 php_enable_session=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable PHP sessions" >&5
-printf %s "checking whether to enable PHP sessions... " >&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+y}
-then :
+if test "${enable_session+set}" = set; then :
   enableval=$enable_session; PHP_SESSION=$enableval
-else case e in #(
-  e)
+else
+
   PHP_SESSION=yes
   test "$PHP_ENABLE_ALL" && PHP_SESSION=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -72982,8 +68650,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -72991,46 +68659,42 @@
 
 php_with_mm=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mm support" >&5
-printf %s "checking for mm support... " >&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+y}
-then :
+if test "${with_mm+set}" = set; then :
   withval=$with_mm; PHP_MM=$withval
-else case e in #(
-  e)
+else
+
   PHP_MM=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_MM
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$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
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pwrite works" >&5
-printf %s "checking whether pwrite works... " >&6; }
-if test ${ac_cv_pwrite+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pwrite works" >&5
+$as_echo_n "checking whether pwrite works... " >&6; }
+if ${ac_cv_pwrite+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
 
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
     ac_cv_pwrite=no
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -73052,32 +68716,28 @@
 
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_pwrite=yes
 
-else case e in #(
-  e)
+else
+
     ac_cv_pwrite=no
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  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 case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -73099,20 +68759,17 @@
 
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_pwrite=yes
 
-else case e in #(
-  e)
+else
+
     ac_cv_pwrite=no
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
@@ -73120,40 +68777,37 @@
         ac_cv_pwrite=64
       fi
     fi
-   ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pwrite" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_PWRITE 1" >>confdefs.h
+$as_echo "#define HAVE_PWRITE 1" >>confdefs.h
 
     if test "$ac_cv_pwrite" = "64"; then
 
-printf "%s\n" "#define PHP_PWRITE_64 1" >>confdefs.h
+$as_echo "#define PHP_PWRITE_64 1" >>confdefs.h
 
     fi
   fi
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether pread works" >&5
-printf %s "checking whether pread works... " >&6; }
-if test ${ac_cv_pread+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pread works" >&5
+$as_echo_n "checking whether pread works... " >&6; }
+if ${ac_cv_pread+:} false; 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 case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -73174,20 +68828,17 @@
     }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_pread=yes
 
-else case e in #(
-  e)
+else
+
     ac_cv_pread=no
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   rm -f conftest_in
@@ -73195,13 +68846,12 @@
     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 case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -73222,20 +68872,17 @@
     }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_pread=yes
 
-else case e in #(
-  e)
+else
+
     ac_cv_pread=no
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
   rm -f conftest_in
@@ -73244,19 +68891,18 @@
         ac_cv_pread=64
       fi
     fi
-   ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pread" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_PREAD 1" >>confdefs.h
+$as_echo "#define HAVE_PREAD 1" >>confdefs.h
 
     if test "$ac_cv_pread" = "64"; then
 
-printf "%s\n" "#define PHP_PREAD_64 1" >>confdefs.h
+$as_echo "#define PHP_PREAD_64 1" >>confdefs.h
 
     fi
   fi
@@ -73395,7 +69041,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SESSION 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SESSION 1
+_ACEOF
 
     fi
   fi
@@ -73578,7 +69226,7 @@
 
 
 
-printf "%s\n" "#define HAVE_PHP_SESSION 1" >>confdefs.h
+$as_echo "#define HAVE_PHP_SESSION 1" >>confdefs.h
 
 fi
 
@@ -73742,7 +69390,7 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBMM 1" >>confdefs.h
+$as_echo "#define HAVE_LIBMM 1" >>confdefs.h
 
 fi
 
@@ -73752,18 +69400,16 @@
 
 php_enable_shmop=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable shmop support" >&5
-printf %s "checking whether to enable shmop support... " >&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+y}
-then :
+if test "${enable_shmop+set}" = set; then :
   enableval=$enable_shmop; PHP_SHMOP=$enableval
-else case e in #(
-  e)
+else
+
   PHP_SHMOP=no
   test "$PHP_ENABLE_ALL" && PHP_SHMOP=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -73789,15 +69435,15 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_SHMOP 1" >>confdefs.h
+$as_echo "#define HAVE_SHMOP 1" >>confdefs.h
 
 
   ext_builddir=ext/shmop
@@ -73933,7 +69579,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SHMOP 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SHMOP 1
+_ACEOF
 
     fi
   fi
@@ -74062,18 +69710,16 @@
 
 php_enable_simplexml=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable SimpleXML support" >&5
-printf %s "checking whether to enable SimpleXML support... " >&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+y}
-then :
+if test "${enable_simplexml+set}" = set; then :
   enableval=$enable_simplexml; PHP_SIMPLEXML=$enableval
-else case e in #(
-  e)
+else
+
   PHP_SIMPLEXML=yes
   test "$PHP_ENABLE_ALL" && PHP_SIMPLEXML=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -74099,8 +69745,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -74114,17 +69760,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
-printf %s "checking for libxml-2.0 >= 2.9.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
+$as_echo_n "checking for libxml-2.0 >= 2.9.0... " >&6; }
 
 if test -n "$LIBXML_CFLAGS"; then
     pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -74138,10 +69784,10 @@
     pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -74155,8 +69801,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -74182,10 +69828,10 @@
 and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -74195,12 +69841,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
 	LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -74345,12 +69991,12 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
 
 
 
-printf "%s\n" "#define HAVE_SIMPLEXML 1" >>confdefs.h
+$as_echo "#define HAVE_SIMPLEXML 1" >>confdefs.h
 
 
   ext_builddir=ext/simplexml
@@ -74486,7 +70132,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SIMPLEXML 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SIMPLEXML 1
+_ACEOF
 
     fi
   fi
@@ -74676,19 +70324,17 @@
 
 php_with_snmp=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SNMP support" >&5
-printf %s "checking for SNMP support... " >&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+y}
-then :
+if test "${with_snmp+set}" = set; then :
   withval=$with_snmp; PHP_SNMP=$withval
-else case e in #(
-  e)
+else
+
   PHP_SNMP=no
   test "$PHP_ENABLE_ALL" && PHP_SNMP=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -74714,8 +70360,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -74725,13 +70371,12 @@
   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
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_path_SNMP_CONFIG+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) case $SNMP_CONFIG in
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_SNMP_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $SNMP_CONFIG in
   [\\/]* | ?:[\\/]*)
   ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a path.
   ;;
@@ -74741,15 +70386,11 @@
 for as_dir in $as_dummy
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
-    ac_cv_path_SNMP_CONFIG="$as_dir$ac_word$ac_exec_ext"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_SNMP_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
@@ -74757,16 +70398,15 @@
 IFS=$as_save_IFS
 
   ;;
-esac ;;
 esac
 fi
 SNMP_CONFIG=$ac_cv_path_SNMP_CONFIG
 if test -n "$SNMP_CONFIG"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SNMP_CONFIG" >&5
-printf "%s\n" "$SNMP_CONFIG" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SNMP_CONFIG" >&5
+$as_echo "$SNMP_CONFIG" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -75034,72 +70674,63 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$SNMP_LIBNAME""_init_snmp" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for init_snmp in -l$SNMP_LIBNAME" >&5
-printf %s "checking for init_snmp in -l$SNMP_LIBNAME... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  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 eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$SNMP_LIBNAME  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char init_snmp (void);
+char init_snmp ();
 int
-main (void)
+main ()
 {
 return init_snmp ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_SNMP 1" >>confdefs.h
+$as_echo "#define HAVE_SNMP 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$SNMP_LIBNAME_init_snmp
 
     as_fn_error $? "SNMP sanity check failed. Please check config.log for more information." "$LINENO" 5
 
-   ;;
-esac
+
 fi
 
 
@@ -75210,70 +70841,61 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$SNMP_LIBNAME""_shutdown_snmp_logging" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shutdown_snmp_logging in -l$SNMP_LIBNAME" >&5
-printf %s "checking for shutdown_snmp_logging in -l$SNMP_LIBNAME... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  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 eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$SNMP_LIBNAME  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char shutdown_snmp_logging (void);
+char shutdown_snmp_logging ();
 int
-main (void)
+main ()
 {
 return shutdown_snmp_logging ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_SHUTDOWN_SNMP_LOGGING 1" >>confdefs.h
+$as_echo "#define HAVE_SHUTDOWN_SNMP_LOGGING 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$SNMP_LIBNAME_shutdown_snmp_logging
 
-   ;;
-esac
+
 fi
 
 
@@ -75384,70 +71006,61 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$SNMP_LIBNAME""_usmHMAC192SHA256AuthProtocol" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usmHMAC192SHA256AuthProtocol in -l$SNMP_LIBNAME" >&5
-printf %s "checking for usmHMAC192SHA256AuthProtocol in -l$SNMP_LIBNAME... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$SNMP_LIBNAME''_usmHMAC192SHA256AuthProtocol" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for usmHMAC192SHA256AuthProtocol in -l$SNMP_LIBNAME" >&5
+$as_echo_n "checking for usmHMAC192SHA256AuthProtocol in -l$SNMP_LIBNAME... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$SNMP_LIBNAME  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char usmHMAC192SHA256AuthProtocol (void);
+char usmHMAC192SHA256AuthProtocol ();
 int
-main (void)
+main ()
 {
 return usmHMAC192SHA256AuthProtocol ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_SNMP_SHA256 1" >>confdefs.h
+$as_echo "#define HAVE_SNMP_SHA256 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$SNMP_LIBNAME_usmHMAC192SHA256AuthProtocol
 
-   ;;
-esac
+
 fi
 
 
@@ -75558,70 +71171,61 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$SNMP_LIBNAME""_usmHMAC384SHA512AuthProtocol" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usmHMAC384SHA512AuthProtocol in -l$SNMP_LIBNAME" >&5
-printf %s "checking for usmHMAC384SHA512AuthProtocol in -l$SNMP_LIBNAME... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$SNMP_LIBNAME''_usmHMAC384SHA512AuthProtocol" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for usmHMAC384SHA512AuthProtocol in -l$SNMP_LIBNAME" >&5
+$as_echo_n "checking for usmHMAC384SHA512AuthProtocol in -l$SNMP_LIBNAME... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$SNMP_LIBNAME  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char usmHMAC384SHA512AuthProtocol (void);
+char usmHMAC384SHA512AuthProtocol ();
 int
-main (void)
+main ()
 {
 return usmHMAC384SHA512AuthProtocol ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_SNMP_SHA512 1" >>confdefs.h
+$as_echo "#define HAVE_SNMP_SHA512 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$SNMP_LIBNAME_usmHMAC384SHA512AuthProtocol
 
-   ;;
-esac
+
 fi
 
 
@@ -75759,7 +71363,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SNMP 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SNMP 1
+_ACEOF
 
     fi
   fi
@@ -75891,18 +71497,16 @@
 
 php_enable_soap=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable SOAP support" >&5
-printf %s "checking whether to enable SOAP support... " >&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+y}
-then :
+if test "${enable_soap+set}" = set; then :
   enableval=$enable_soap; PHP_SOAP=$enableval
-else case e in #(
-  e)
+else
+
   PHP_SOAP=no
   test "$PHP_ENABLE_ALL" && PHP_SOAP=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -75928,8 +71532,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -75943,17 +71547,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
-printf %s "checking for libxml-2.0 >= 2.9.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
+$as_echo_n "checking for libxml-2.0 >= 2.9.0... " >&6; }
 
 if test -n "$LIBXML_CFLAGS"; then
     pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -75967,10 +71571,10 @@
     pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -75984,8 +71588,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -76011,10 +71615,10 @@
 and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -76024,12 +71628,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
 	LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -76174,12 +71778,12 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
 
 
 
-printf "%s\n" "#define HAVE_SOAP 1" >>confdefs.h
+$as_echo "#define HAVE_SOAP 1" >>confdefs.h
 
 
   ext_builddir=ext/soap
@@ -76315,7 +71919,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SOAP 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SOAP 1
+_ACEOF
 
     fi
   fi
@@ -76449,18 +72055,16 @@
 
 php_enable_sockets=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable sockets support" >&5
-printf %s "checking whether to enable sockets support... " >&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+y}
-then :
+if test "${enable_sockets+set}" = set; then :
   enableval=$enable_sockets; PHP_SOCKETS=$enableval
-else case e in #(
-  e)
+else
+
   PHP_SOCKETS=no
   test "$PHP_ENABLE_ALL" && PHP_SOCKETS=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -76486,62 +72090,48 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$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
-  ac_fn_c_check_func "$LINENO" "hstrerror" "ac_cv_func_hstrerror"
-if test "x$ac_cv_func_hstrerror" = xyes
-then :
-  printf "%s\n" "#define HAVE_HSTRERROR 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "if_nametoindex" "ac_cv_func_if_nametoindex"
-if test "x$ac_cv_func_if_nametoindex" = xyes
-then :
-  printf "%s\n" "#define HAVE_IF_NAMETOINDEX 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "if_indextoname" "ac_cv_func_if_indextoname"
-if test "x$ac_cv_func_if_indextoname" = xyes
-then :
-  printf "%s\n" "#define HAVE_IF_INDEXTONAME 1" >>confdefs.h
+  for ac_func in hstrerror 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"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
+done
 
-  ac_fn_c_check_header_compile "$LINENO" "netinet/tcp.h" "ac_cv_header_netinet_tcp_h" "$ac_includes_default"
-if test "x$ac_cv_header_netinet_tcp_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_NETINET_TCP_H 1" >>confdefs.h
+  for ac_header in netinet/tcp.h sys/un.h sys/sockio.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
 
 fi
-ac_fn_c_check_header_compile "$LINENO" "sys/un.h" "ac_cv_header_sys_un_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_un_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_UN_H 1" >>confdefs.h
 
-fi
-ac_fn_c_check_header_compile "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_sockio_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_SYS_SOCKIO_H 1" >>confdefs.h
+done
 
-fi
 
+$as_echo "#define HAVE_SOCKETS 1" >>confdefs.h
 
-printf "%s\n" "#define HAVE_SOCKETS 1" >>confdefs.h
 
+    { $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 ${ac_cv_ss_family+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for field ss_family in struct sockaddr_storage" >&5
-printf %s "checking for field ss_family in struct sockaddr_storage... " >&6; }
-if test ${ac_cv_ss_family+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -76550,160 +72140,144 @@
 #include <netdb.h>
 
 int
-main (void)
+main ()
 {
 struct sockaddr_storage sa_store; sa_store.ss_family = AF_INET6;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_ss_family=yes
-else case e in #(
-  e) ac_cv_ss_family=no ;;
-esac
+else
+  ac_cv_ss_family=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ss_family" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_SA_SS_FAMILY 1" >>confdefs.h
+$as_echo "#define HAVE_SA_SS_FAMILY 1" >>confdefs.h
 
   fi
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo supports AI_V4MAPPED" >&5
-printf %s "checking if getaddrinfo supports AI_V4MAPPED... " >&6; }
-if test ${ac_cv_gai_ai_v4mapped+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo supports AI_V4MAPPED" >&5
+$as_echo_n "checking if getaddrinfo supports AI_V4MAPPED... " >&6; }
+if ${ac_cv_gai_ai_v4mapped+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <netdb.h>
 
 int
-main (void)
+main ()
 {
 int flag = AI_V4MAPPED;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_gai_ai_v4mapped=yes
-else case e in #(
-  e) ac_cv_gai_ai_v4mapped=no ;;
-esac
+else
+  ac_cv_gai_ai_v4mapped=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gai_ai_v4mapped" >&5
-printf "%s\n" "$ac_cv_gai_ai_v4mapped" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gai_ai_v4mapped" >&5
+$as_echo "$ac_cv_gai_ai_v4mapped" >&6; }
 
   if test "$ac_cv_gai_ai_v4mapped" = yes; then
 
-printf "%s\n" "#define HAVE_AI_V4MAPPED 1" >>confdefs.h
+$as_echo "#define HAVE_AI_V4MAPPED 1" >>confdefs.h
 
   fi
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo supports AI_ALL" >&5
-printf %s "checking if getaddrinfo supports AI_ALL... " >&6; }
-if test ${ac_cv_gai_ai_all+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo supports AI_ALL" >&5
+$as_echo_n "checking if getaddrinfo supports AI_ALL... " >&6; }
+if ${ac_cv_gai_ai_all+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <netdb.h>
 
 int
-main (void)
+main ()
 {
 int flag = AI_ALL;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_gai_ai_all=yes
-else case e in #(
-  e) ac_cv_gai_ai_all=no ;;
-esac
+else
+  ac_cv_gai_ai_all=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gai_ai_all" >&5
-printf "%s\n" "$ac_cv_gai_ai_all" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gai_ai_all" >&5
+$as_echo "$ac_cv_gai_ai_all" >&6; }
 
   if test "$ac_cv_gai_ai_all" = yes; then
 
-printf "%s\n" "#define HAVE_AI_ALL 1" >>confdefs.h
+$as_echo "#define HAVE_AI_ALL 1" >>confdefs.h
 
   fi
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo supports AI_IDN" >&5
-printf %s "checking if getaddrinfo supports AI_IDN... " >&6; }
-if test ${ac_cv_gai_ai_idn+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo supports AI_IDN" >&5
+$as_echo_n "checking if getaddrinfo supports AI_IDN... " >&6; }
+if ${ac_cv_gai_ai_idn+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <netdb.h>
 
 int
-main (void)
+main ()
 {
 int flag = AI_IDN;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_gai_ai_idn=yes
-else case e in #(
-  e) ac_cv_gai_ai_idn=no ;;
-esac
+else
+  ac_cv_gai_ai_idn=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gai_ai_idn" >&5
-printf "%s\n" "$ac_cv_gai_ai_idn" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gai_ai_idn" >&5
+$as_echo "$ac_cv_gai_ai_idn" >&6; }
 
   if test "$ac_cv_gai_ai_idn" = yes; then
 
-printf "%s\n" "#define HAVE_AI_IDN 1" >>confdefs.h
+$as_echo "#define HAVE_AI_IDN 1" >>confdefs.h
 
   fi
 
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ancillary credentials uses ucred" >&5
-printf %s "checking if ancillary credentials uses ucred... " >&6; }
-if test ${ac_cv_ucred+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ancillary credentials uses ucred" >&5
+$as_echo_n "checking if ancillary credentials uses ucred... " >&6; }
+if ${ac_cv_ucred+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -76713,70 +72287,63 @@
 #include <sys/socket.h>
 
 int
-main (void)
+main ()
 {
 struct ucred u = {.gid = 0};
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_ucred=yes
-else case e in #(
-  e) ac_cv_ucred=no ;;
-esac
+else
+  ac_cv_ucred=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ucred" >&5
-printf "%s\n" "$ac_cv_ucred" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ucred" >&5
+$as_echo "$ac_cv_ucred" >&6; }
 
   if test "$ac_cv_ucred" = yes; then
 
-printf "%s\n" "#define ANC_CREDS_UCRED 1" >>confdefs.h
+$as_echo "#define ANC_CREDS_UCRED 1" >>confdefs.h
 
   fi
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ancillary credentials uses cmsgcred" >&5
-printf %s "checking if ancillary credentials uses cmsgcred... " >&6; }
-if test ${ac_cv_cmsgcred+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if ancillary credentials uses cmsgcred" >&5
+$as_echo_n "checking if ancillary credentials uses cmsgcred... " >&6; }
+if ${ac_cv_cmsgcred+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/socket.h>
 
 int
-main (void)
+main ()
 {
 struct cmsgcred c = {0};
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_cmsgcred=yes
-else case e in #(
-  e) ac_cv_cmsgcred=no ;;
-esac
+else
+  ac_cv_cmsgcred=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-   ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cmsgcred" >&5
-printf "%s\n" "$ac_cv_cmsgcred" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cmsgcred" >&5
+$as_echo "$ac_cv_cmsgcred" >&6; }
 
   if test "$ac_cv_cmsgcred" = yes; then
 
-printf "%s\n" "#define ANC_CREDS_CMSGCRED 1" >>confdefs.h
+$as_echo "#define ANC_CREDS_CMSGCRED 1" >>confdefs.h
 
   fi
 
@@ -76919,7 +72486,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SOCKETS 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SOCKETS 1
+_ACEOF
 
     fi
   fi
@@ -77068,19 +72637,17 @@
 
 php_with_sodium=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sodium support" >&5
-printf %s "checking for sodium support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sodium support" >&5
+$as_echo_n "checking for sodium support... " >&6; }
 
 # Check whether --with-sodium was given.
-if test ${with_sodium+y}
-then :
+if test "${with_sodium+set}" = set; then :
   withval=$with_sodium; PHP_SODIUM=$withval
-else case e in #(
-  e)
+else
+
   PHP_SODIUM=no
   test "$PHP_ENABLE_ALL" && PHP_SODIUM=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -77106,8 +72673,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -77115,17 +72682,17 @@
 if test "$PHP_SODIUM" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsodium >= 1.0.8" >&5
-printf %s "checking for libsodium >= 1.0.8... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libsodium >= 1.0.8" >&5
+$as_echo_n "checking for libsodium >= 1.0.8... " >&6; }
 
 if test -n "$LIBSODIUM_CFLAGS"; then
     pkg_cv_LIBSODIUM_CFLAGS="$LIBSODIUM_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsodium >= 1.0.8\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsodium >= 1.0.8\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsodium >= 1.0.8") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBSODIUM_CFLAGS=`$PKG_CONFIG --cflags "libsodium >= 1.0.8" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -77139,10 +72706,10 @@
     pkg_cv_LIBSODIUM_LIBS="$LIBSODIUM_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsodium >= 1.0.8\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsodium >= 1.0.8\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libsodium >= 1.0.8") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBSODIUM_LIBS=`$PKG_CONFIG --libs "libsodium >= 1.0.8" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -77156,8 +72723,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -77183,10 +72750,10 @@
 and LIBSODIUM_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -77196,12 +72763,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	LIBSODIUM_CFLAGS=$pkg_cv_LIBSODIUM_CFLAGS
 	LIBSODIUM_LIBS=$pkg_cv_LIBSODIUM_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -77346,49 +72913,43 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBSODIUMLIB 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSODIUMLIB 1" >>confdefs.h
 
 
     SODIUM_COMPILER_FLAGS="$LIBSODIUM_CFLAGS -Wno-type-limits"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-logical-op" >&5
-printf %s "checking whether C compiler accepts -Wno-logical-op... " >&6; }
-if test ${ax_cv_check_cflags__Werror__Wno_logical_op+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-logical-op" >&5
+$as_echo_n "checking whether C compiler accepts -Wno-logical-op... " >&6; }
+if ${ax_cv_check_cflags__Werror__Wno_logical_op+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wno-logical-op"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__Wno_logical_op=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__Wno_logical_op=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__Wno_logical_op=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_logical_op" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_logical_op" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wno_logical_op" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_logical_op" >&5
+$as_echo "$ax_cv_check_cflags__Werror__Wno_logical_op" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wno_logical_op" = xyes; then :
   SODIUM_COMPILER_FLAGS="$SODIUM_COMPILER_FLAGS -Wno-logical-op"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
 
@@ -77525,7 +73086,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SODIUM 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SODIUM 1
+_ACEOF
 
     fi
   fi
@@ -77788,7 +73351,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SPL 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SPL 1
+_ACEOF
 
     fi
   fi
@@ -77990,20 +73555,18 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether flush should be called explicitly after a buffered io" >&5
-printf %s "checking whether flush should be called explicitly after a buffered io... " >&6; }
-if test ${ac_cv_flush_io+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-if test "$cross_compiling" = yes
-then :
+{ $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 ${ac_cv_flush_io+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+if test "$cross_compiling" = yes; then :
 
   ac_cv_flush_io=no
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -78045,54 +73608,48 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_flush_io=no
 
-else case e in #(
-  e)
+else
+
   ac_cv_flush_io=yes
- ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_flush_io" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_FLUSHIO 1" >>confdefs.h
+$as_echo "#define HAVE_FLUSHIO 1" >>confdefs.h
 
 fi
 
 
 php_with_external_libcrypt=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for external libcrypt or libxcrypt" >&5
-printf %s "checking for external libcrypt or libxcrypt... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for external libcrypt or libxcrypt" >&5
+$as_echo_n "checking for external libcrypt or libxcrypt... " >&6; }
 
 # Check whether --with-external-libcrypt was given.
-if test ${with_external_libcrypt+y}
-then :
+if test "${with_external_libcrypt+set}" = set; then :
   withval=$with_external_libcrypt; PHP_EXTERNAL_LIBCRYPT=$withval
-else case e in #(
-  e)
+else
+
   PHP_EXTERNAL_LIBCRYPT=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_EXTERNAL_LIBCRYPT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -78104,27 +73661,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "crypt" "ac_cv_func_crypt"
-if test "x$ac_cv_func_crypt" = xyes
-then :
+if test "x$ac_cv_func_crypt" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__crypt" "ac_cv_func___crypt"
-if test "x$ac_cv_func___crypt" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__crypt" "ac_cv_func___crypt"
+if test "x$ac_cv_func___crypt" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_CRYPT 1" >>confdefs.h
+$as_echo "#define HAVE_CRYPT 1" >>confdefs.h
 
     ac_cv_func_crypt=yes
   ;;
@@ -78134,140 +73687,118 @@
   unset ac_cv_lib_crypt_crypt
   unset ac_cv_lib_crypt___crypt
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
-printf %s "checking for crypt in -lcrypt... " >&6; }
-if test ${ac_cv_lib_crypt_crypt+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5
+$as_echo_n "checking for crypt in -lcrypt... " >&6; }
+if ${ac_cv_lib_crypt_crypt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char crypt (void);
+char crypt ();
 int
-main (void)
+main ()
 {
 return crypt ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_crypt_crypt=yes
-else case e in #(
-  e) ac_cv_lib_crypt_crypt=no ;;
-esac
+else
+  ac_cv_lib_crypt_crypt=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5
-printf "%s\n" "$ac_cv_lib_crypt_crypt" >&6; }
-if test "x$ac_cv_lib_crypt_crypt" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __crypt in -lcrypt" >&5
-printf %s "checking for __crypt in -lcrypt... " >&6; }
-if test ${ac_cv_lib_crypt___crypt+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __crypt in -lcrypt" >&5
+$as_echo_n "checking for __crypt in -lcrypt... " >&6; }
+if ${ac_cv_lib_crypt___crypt+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __crypt (void);
+char __crypt ();
 int
-main (void)
+main ()
 {
 return __crypt ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_crypt___crypt=yes
-else case e in #(
-  e) ac_cv_lib_crypt___crypt=no ;;
-esac
+else
+  ac_cv_lib_crypt___crypt=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt___crypt" >&5
-printf "%s\n" "$ac_cv_lib_crypt___crypt" >&6; }
-if test "x$ac_cv_lib_crypt___crypt" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lcrypt"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -78285,10 +73816,10 @@
 
 
 
-printf "%s\n" "#define HAVE_CRYPT 1" >>confdefs.h
+$as_echo "#define HAVE_CRYPT 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBCRYPT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBCRYPT 1" >>confdefs.h
 
     ac_cv_func_crypt=yes
   else
@@ -78307,27 +73838,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "crypt_r" "ac_cv_func_crypt_r"
-if test "x$ac_cv_func_crypt_r" = xyes
-then :
+if test "x$ac_cv_func_crypt_r" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__crypt_r" "ac_cv_func___crypt_r"
-if test "x$ac_cv_func___crypt_r" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__crypt_r" "ac_cv_func___crypt_r"
+if test "x$ac_cv_func___crypt_r" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_CRYPT_R 1" >>confdefs.h
+$as_echo "#define HAVE_CRYPT_R 1" >>confdefs.h
 
     ac_cv_func_crypt_r=yes
   ;;
@@ -78337,140 +73864,118 @@
   unset ac_cv_lib_crypt_crypt_r
   unset ac_cv_lib_crypt___crypt_r
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for crypt_r in -lcrypt" >&5
-printf %s "checking for crypt_r in -lcrypt... " >&6; }
-if test ${ac_cv_lib_crypt_crypt_r+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt_r in -lcrypt" >&5
+$as_echo_n "checking for crypt_r in -lcrypt... " >&6; }
+if ${ac_cv_lib_crypt_crypt_r+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char crypt_r (void);
+char crypt_r ();
 int
-main (void)
+main ()
 {
 return crypt_r ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_crypt_crypt_r=yes
-else case e in #(
-  e) ac_cv_lib_crypt_crypt_r=no ;;
-esac
+else
+  ac_cv_lib_crypt_crypt_r=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt_r" >&5
-printf "%s\n" "$ac_cv_lib_crypt_crypt_r" >&6; }
-if test "x$ac_cv_lib_crypt_crypt_r" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt_r" >&5
+$as_echo "$ac_cv_lib_crypt_crypt_r" >&6; }
+if test "x$ac_cv_lib_crypt_crypt_r" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __crypt_r in -lcrypt" >&5
-printf %s "checking for __crypt_r in -lcrypt... " >&6; }
-if test ${ac_cv_lib_crypt___crypt_r+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __crypt_r in -lcrypt" >&5
+$as_echo_n "checking for __crypt_r in -lcrypt... " >&6; }
+if ${ac_cv_lib_crypt___crypt_r+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypt  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __crypt_r (void);
+char __crypt_r ();
 int
-main (void)
+main ()
 {
 return __crypt_r ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_crypt___crypt_r=yes
-else case e in #(
-  e) ac_cv_lib_crypt___crypt_r=no ;;
-esac
+else
+  ac_cv_lib_crypt___crypt_r=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt___crypt_r" >&5
-printf "%s\n" "$ac_cv_lib_crypt___crypt_r" >&6; }
-if test "x$ac_cv_lib_crypt___crypt_r" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt___crypt_r" >&5
+$as_echo "$ac_cv_lib_crypt___crypt_r" >&6; }
+if test "x$ac_cv_lib_crypt___crypt_r" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 fi
 
 
   if test "$found" = "yes"; then
     ac_libs=$LIBS
     LIBS="$LIBS -lcrypt"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
             found=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -78488,10 +73993,10 @@
 
 
 
-printf "%s\n" "#define HAVE_CRYPT_R 1" >>confdefs.h
+$as_echo "#define HAVE_CRYPT_R 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBCRYPT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBCRYPT 1" >>confdefs.h
 
     ac_cv_func_crypt_r=yes
   else
@@ -78504,22 +74009,26 @@
 
   esac
 
-  ac_fn_c_check_header_compile "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default"
-if test "x$ac_cv_header_crypt_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_CRYPT_H 1" >>confdefs.h
+  for ac_header in crypt.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "crypt.h" "ac_cv_header_crypt_h" "$ac_includes_default"
+if test "x$ac_cv_header_crypt_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_CRYPT_H 1
+_ACEOF
 
 fi
 
+done
+
   if test "$ac_cv_func_crypt_r" = "yes"; then
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking which data struct is used by crypt_r" >&5
-printf %s "checking which data struct is used by crypt_r... " >&6; }
-if test ${php_cv_crypt_r_style+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $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 ${php_cv_crypt_r_style+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
     php_cv_crypt_r_style=none
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
@@ -78528,7 +74037,7 @@
 #include <crypt.h>
 
 int
-main (void)
+main ()
 {
 
 CRYPTD buffer;
@@ -78538,11 +74047,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   php_cv_crypt_r_style=cryptd
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 
     if test "$php_cv_crypt_r_style" = "none"; then
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -78552,7 +74060,7 @@
 #include <crypt.h>
 
 int
-main (void)
+main ()
 {
 
 struct crypt_data buffer;
@@ -78562,11 +74070,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   php_cv_crypt_r_style=struct_crypt_data
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     fi
 
     if test "$php_cv_crypt_r_style" = "none"; then
@@ -78578,7 +74085,7 @@
 #include <crypt.h>
 
 int
-main (void)
+main ()
 {
 
 struct crypt_data buffer;
@@ -78588,11 +74095,10 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   php_cv_crypt_r_style=struct_crypt_data_gnu_source
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     fi
 
     if test "$php_cv_crypt_r_style" = "none"; then
@@ -78603,7 +74109,7 @@
 #include <unistd.h>
 
 int
-main (void)
+main ()
 {
 
 struct crypt_data buffer;
@@ -78613,31 +74119,29 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   php_cv_crypt_r_style=struct_crypt_data
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     fi
-     ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_crypt_r_style" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define CRYPT_R_CRYPTD 1" >>confdefs.h
+$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
 
-printf "%s\n" "#define CRYPT_R_STRUCT_CRYPT_DATA 1" >>confdefs.h
+$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
 
-printf "%s\n" "#define CRYPT_R_GNU_SOURCE 1" >>confdefs.h
+$as_echo "#define CRYPT_R_GNU_SOURCE 1" >>confdefs.h
 
   fi
   if test "$php_cv_crypt_r_style" = "none"; then
@@ -78646,20 +74150,18 @@
 
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for standard DES crypt" >&5
-printf %s "checking for standard DES crypt... " >&6; }
-if test ${ac_cv_crypt_des+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-    if test "$cross_compiling" = yes
-then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for standard DES crypt" >&5
+$as_echo_n "checking for standard DES crypt... " >&6; }
+if ${ac_cv_crypt_des+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    if test "$cross_compiling" = yes; then :
 
   ac_cv_crypt_des=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <string.h>
@@ -78684,41 +74186,35 @@
 #endif
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
   ac_cv_crypt_des=yes
 
-else case e in #(
-  e)
+else
+
   ac_cv_crypt_des=no
- ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_des" >&5
-printf "%s\n" "$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; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for extended DES crypt" >&5
+$as_echo_n "checking for extended DES crypt... " >&6; }
+if ${ac_cv_crypt_ext_des+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for extended DES crypt" >&5
-printf %s "checking for extended DES crypt... " >&6; }
-if test ${ac_cv_crypt_ext_des+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
 
     ac_cv_crypt_ext_des=no
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <string.h>
@@ -78743,41 +74239,35 @@
 #endif
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_crypt_ext_des=yes
 
-else case e in #(
-  e)
+else
+
     ac_cv_crypt_ext_des=no
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_ext_des" >&5
-printf "%s\n" "$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; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5 crypt" >&5
+$as_echo_n "checking for MD5 crypt... " >&6; }
+if ${ac_cv_crypt_md5+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MD5 crypt" >&5
-printf %s "checking for MD5 crypt... " >&6; }
-if test ${ac_cv_crypt_md5+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
     ac_cv_crypt_md5=no
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <string.h>
@@ -78812,41 +74302,35 @@
 #endif
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_crypt_md5=yes
 
-else case e in #(
-  e)
+else
+
     ac_cv_crypt_md5=no
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_md5" >&5
-printf "%s\n" "$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; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Blowfish crypt" >&5
+$as_echo_n "checking for Blowfish crypt... " >&6; }
+if ${ac_cv_crypt_blowfish+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Blowfish crypt" >&5
-printf %s "checking for Blowfish crypt... " >&6; }
-if test ${ac_cv_crypt_blowfish+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
     ac_cv_crypt_blowfish=no
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <string.h>
@@ -78878,41 +74362,35 @@
 #endif
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_crypt_blowfish=yes
 
-else case e in #(
-  e)
+else
+
     ac_cv_crypt_blowfish=no
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_blowfish" >&5
-printf "%s\n" "$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; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA512 crypt" >&5
+$as_echo_n "checking for SHA512 crypt... " >&6; }
+if ${ac_cv_crypt_sha512+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SHA512 crypt" >&5
-printf %s "checking for SHA512 crypt... " >&6; }
-if test ${ac_cv_crypt_sha512+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
     ac_cv_crypt_sha512=no
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <string.h>
@@ -78943,41 +74421,35 @@
 #endif
   }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_crypt_sha512=yes
 
-else case e in #(
-  e)
+else
+
     ac_cv_crypt_sha512=no
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_sha512" >&5
-printf "%s\n" "$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; }
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHA256 crypt" >&5
+$as_echo_n "checking for SHA256 crypt... " >&6; }
+if ${ac_cv_crypt_sha256+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SHA256 crypt" >&5
-printf %s "checking for SHA256 crypt... " >&6; }
-if test ${ac_cv_crypt_sha256+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-  if test "$cross_compiling" = yes
-then :
+  if test "$cross_compiling" = yes; then :
 
     ac_cv_crypt_sha256=no
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <string.h>
@@ -79008,26 +74480,22 @@
 #endif
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
 
     ac_cv_crypt_sha256=yes
 
-else case e in #(
-  e)
+else
+
     ac_cv_crypt_sha256=no
-   ;;
-esac
+
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_crypt_sha256" >&5
-printf "%s\n" "$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 "$ac_cv_crypt_md5" = "no" || test "$ac_cv_crypt_sha512" = "no" || test "$ac_cv_crypt_sha256" = "no" || test "$ac_cv_func_crypt_r" != "yes"; then
@@ -79035,11 +74503,15 @@
   fi
 
 
-printf "%s\n" "#define PHP_USE_PHP_CRYPT_R 0" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_USE_PHP_CRYPT_R 0
+_ACEOF
 
 else
 
-printf "%s\n" "#define PHP_USE_PHP_CRYPT_R 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_USE_PHP_CRYPT_R 1
+_ACEOF
 
 
 
@@ -79090,19 +74562,18 @@
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports aligned attribute" >&5
-printf %s "checking whether the compiler supports aligned attribute... " >&6; }
-if test ${ac_cv_attribute_aligned+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $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 ${ac_cv_attribute_aligned+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
 int
-main (void)
+main ()
 {
 
   unsigned char test[32] __attribute__ ((__aligned__ (__alignof__ (int))));
@@ -79111,25 +74582,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
   ac_cv_attribute_aligned=yes
 
-else case e in #(
-  e)
+else
+
   ac_cv_attribute_aligned=no
- ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_attribute_aligned" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_ATTRIBUTE_ALIGNED 1" >>confdefs.h
+$as_echo "#define HAVE_ATTRIBUTE_ALIGNED 1" >>confdefs.h
 
 fi
 
@@ -79137,33 +74605,31 @@
   case $host_alias in
     *linux*)
 
-printf "%s\n" "#define HAVE_FNMATCH 1" >>confdefs.h
+$as_echo "#define HAVE_FNMATCH 1" >>confdefs.h
 
       ;;
   esac
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working POSIX fnmatch" >&5
-printf %s "checking for working POSIX fnmatch... " >&6; }
-if test ${ac_cv_func_fnmatch_works+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) # Some versions of Solaris, SCO, and the GNU C Library
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working POSIX fnmatch" >&5
+$as_echo_n "checking for working POSIX fnmatch... " >&6; }
+if ${ac_cv_func_fnmatch_works+:} false; 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, François Pinard, and Paul Eggert for this test.
-   if test "$cross_compiling" = yes
-then :
+   # Thanks to John Oleynick, Franc,ois Pinard, and Paul Eggert for this test.
+   if test "$cross_compiling" = yes; then :
   ac_cv_func_fnmatch_works=cross
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <fnmatch.h>
 #	   define y(a, b, c) (fnmatch (a, b, c) == 0)
 #	   define n(a, b, c) (fnmatch (a, b, c) == FNM_NOMATCH)
 
 int
-main (void)
+main ()
 {
 return
 	   (!(y ("a*", "abc", 0)
@@ -79177,65 +74643,57 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_func_fnmatch_works=yes
-else case e in #(
-  e) ac_cv_func_fnmatch_works=no ;;
-esac
+else
+  ac_cv_func_fnmatch_works=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fnmatch_works" >&5
-printf "%s\n" "$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 :
 
-printf "%s\n" "#define HAVE_FNMATCH 1" >>confdefs.h
+$as_echo "#define HAVE_FNMATCH 1" >>confdefs.h
 
 fi
 
 
 fi
 
-
-  for ac_func in fork CreateProcess
+for ac_func in fork CreateProcess
 do :
-  as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | sed "$as_sed_sh"`
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"
-then :
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define `printf "%s\n" "HAVE_$ac_func" | sed "$as_sed_cpp"` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
   php_can_support_proc_open=yes
   break
 
-else case e in #(
-  e)
+else
+
   php_can_support_proc_open=no
- ;;
-esac
-fi
 
+fi
 done
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if your OS can spawn processes with inherited handles" >&5
-printf %s "checking if your OS can spawn processes with inherited handles... " >&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
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define PHP_CAN_SUPPORT_PROC_OPEN 1" >>confdefs.h
+$as_echo "#define PHP_CAN_SUPPORT_PROC_OPEN 1" >>confdefs.h
 
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 PHP_ENABLE_CHROOT_FUNC=no
@@ -79262,7 +74720,7 @@
 
 if test "$PHP_ENABLE_CHROOT_FUNC" = "yes"; then
 
-printf "%s\n" "#define ENABLE_CHROOT_FUNC 1" >>confdefs.h
+$as_echo "#define ENABLE_CHROOT_FUNC 1" >>confdefs.h
 
 fi
 
@@ -79272,27 +74730,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "res_nsearch" "ac_cv_func_res_nsearch"
-if test "x$ac_cv_func_res_nsearch" = xyes
-then :
+if test "x$ac_cv_func_res_nsearch" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__res_nsearch" "ac_cv_func___res_nsearch"
-if test "x$ac_cv_func___res_nsearch" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__res_nsearch" "ac_cv_func___res_nsearch"
+if test "x$ac_cv_func___res_nsearch" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_RES_NSEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_RES_NSEARCH 1" >>confdefs.h
 
     ac_cv_func_res_nsearch=yes
   ;;
@@ -79302,140 +74756,118 @@
   unset ac_cv_lib_resolv_res_nsearch
   unset ac_cv_lib_resolv___res_nsearch
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lresolv" >&5
-printf %s "checking for res_nsearch in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv_res_nsearch+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_resolv_res_nsearch+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char res_nsearch (void);
+char res_nsearch ();
 int
-main (void)
+main ()
 {
 return res_nsearch ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv_res_nsearch=yes
-else case e in #(
-  e) ac_cv_lib_resolv_res_nsearch=no ;;
-esac
+else
+  ac_cv_lib_resolv_res_nsearch=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_nsearch" >&5
-printf "%s\n" "$ac_cv_lib_resolv_res_nsearch" >&6; }
-if test "x$ac_cv_lib_resolv_res_nsearch" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lresolv" >&5
-printf %s "checking for __res_nsearch in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv___res_nsearch+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $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 ${ac_cv_lib_resolv___res_nsearch+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __res_nsearch (void);
+char __res_nsearch ();
 int
-main (void)
+main ()
 {
 return __res_nsearch ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv___res_nsearch=yes
-else case e in #(
-  e) ac_cv_lib_resolv___res_nsearch=no ;;
-esac
+else
+  ac_cv_lib_resolv___res_nsearch=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_nsearch" >&5
-printf "%s\n" "$ac_cv_lib_resolv___res_nsearch" >&6; }
-if test "x$ac_cv_lib_resolv___res_nsearch" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -79453,10 +74885,10 @@
 
 
 
-printf "%s\n" "#define HAVE_RES_NSEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_RES_NSEARCH 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h
+$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_res_nsearch=yes
   else
@@ -79465,140 +74897,118 @@
   unset ac_cv_lib_bind_res_nsearch
   unset ac_cv_lib_bind___res_nsearch
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lbind" >&5
-printf %s "checking for res_nsearch in -lbind... " >&6; }
-if test ${ac_cv_lib_bind_res_nsearch+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_bind_res_nsearch+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char res_nsearch (void);
+char res_nsearch ();
 int
-main (void)
+main ()
 {
 return res_nsearch ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind_res_nsearch=yes
-else case e in #(
-  e) ac_cv_lib_bind_res_nsearch=no ;;
-esac
+else
+  ac_cv_lib_bind_res_nsearch=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_nsearch" >&5
-printf "%s\n" "$ac_cv_lib_bind_res_nsearch" >&6; }
-if test "x$ac_cv_lib_bind_res_nsearch" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lbind" >&5
-printf %s "checking for __res_nsearch in -lbind... " >&6; }
-if test ${ac_cv_lib_bind___res_nsearch+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $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 ${ac_cv_lib_bind___res_nsearch+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __res_nsearch (void);
+char __res_nsearch ();
 int
-main (void)
+main ()
 {
 return __res_nsearch ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind___res_nsearch=yes
-else case e in #(
-  e) ac_cv_lib_bind___res_nsearch=no ;;
-esac
+else
+  ac_cv_lib_bind___res_nsearch=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_nsearch" >&5
-printf "%s\n" "$ac_cv_lib_bind___res_nsearch" >&6; }
-if test "x$ac_cv_lib_bind___res_nsearch" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -79616,10 +75026,10 @@
 
 
 
-printf "%s\n" "#define HAVE_RES_NSEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_RES_NSEARCH 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBBIND 1" >>confdefs.h
+$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_res_nsearch=yes
   else
@@ -79628,140 +75038,118 @@
   unset ac_cv_lib_socket_res_nsearch
   unset ac_cv_lib_socket___res_nsearch
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_nsearch in -lsocket" >&5
-printf %s "checking for res_nsearch in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket_res_nsearch+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_socket_res_nsearch+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char res_nsearch (void);
+char res_nsearch ();
 int
-main (void)
+main ()
 {
 return res_nsearch ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_res_nsearch=yes
-else case e in #(
-  e) ac_cv_lib_socket_res_nsearch=no ;;
-esac
+else
+  ac_cv_lib_socket_res_nsearch=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_nsearch" >&5
-printf "%s\n" "$ac_cv_lib_socket_res_nsearch" >&6; }
-if test "x$ac_cv_lib_socket_res_nsearch" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_nsearch in -lsocket" >&5
-printf %s "checking for __res_nsearch in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket___res_nsearch+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $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 ${ac_cv_lib_socket___res_nsearch+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __res_nsearch (void);
+char __res_nsearch ();
 int
-main (void)
+main ()
 {
 return __res_nsearch ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___res_nsearch=yes
-else case e in #(
-  e) ac_cv_lib_socket___res_nsearch=no ;;
-esac
+else
+  ac_cv_lib_socket___res_nsearch=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_nsearch" >&5
-printf "%s\n" "$ac_cv_lib_socket___res_nsearch" >&6; }
-if test "x$ac_cv_lib_socket___res_nsearch" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -79779,10 +75167,10 @@
 
 
 
-printf "%s\n" "#define HAVE_RES_NSEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_RES_NSEARCH 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_res_nsearch=yes
   else
@@ -79807,27 +75195,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "res_ndestroy" "ac_cv_func_res_ndestroy"
-if test "x$ac_cv_func_res_ndestroy" = xyes
-then :
+if test "x$ac_cv_func_res_ndestroy" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__res_ndestroy" "ac_cv_func___res_ndestroy"
-if test "x$ac_cv_func___res_ndestroy" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__res_ndestroy" "ac_cv_func___res_ndestroy"
+if test "x$ac_cv_func___res_ndestroy" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_RES_NDESTROY 1" >>confdefs.h
+$as_echo "#define HAVE_RES_NDESTROY 1" >>confdefs.h
 
     ac_cv_func_res_ndestroy=yes
   ;;
@@ -79837,140 +75221,118 @@
   unset ac_cv_lib_resolv_res_ndestroy
   unset ac_cv_lib_resolv___res_ndestroy
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy in -lresolv" >&5
-printf %s "checking for res_ndestroy in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv_res_ndestroy+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy in -lresolv" >&5
+$as_echo_n "checking for res_ndestroy in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv_res_ndestroy+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char res_ndestroy (void);
+char res_ndestroy ();
 int
-main (void)
+main ()
 {
 return res_ndestroy ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv_res_ndestroy=yes
-else case e in #(
-  e) ac_cv_lib_resolv_res_ndestroy=no ;;
-esac
+else
+  ac_cv_lib_resolv_res_ndestroy=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_ndestroy" >&5
-printf "%s\n" "$ac_cv_lib_resolv_res_ndestroy" >&6; }
-if test "x$ac_cv_lib_resolv_res_ndestroy" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_ndestroy" >&5
+$as_echo "$ac_cv_lib_resolv_res_ndestroy" >&6; }
+if test "x$ac_cv_lib_resolv_res_ndestroy" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_ndestroy in -lresolv" >&5
-printf %s "checking for __res_ndestroy in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv___res_ndestroy+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_ndestroy in -lresolv" >&5
+$as_echo_n "checking for __res_ndestroy in -lresolv... " >&6; }
+if ${ac_cv_lib_resolv___res_ndestroy+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __res_ndestroy (void);
+char __res_ndestroy ();
 int
-main (void)
+main ()
 {
 return __res_ndestroy ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv___res_ndestroy=yes
-else case e in #(
-  e) ac_cv_lib_resolv___res_ndestroy=no ;;
-esac
+else
+  ac_cv_lib_resolv___res_ndestroy=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_ndestroy" >&5
-printf "%s\n" "$ac_cv_lib_resolv___res_ndestroy" >&6; }
-if test "x$ac_cv_lib_resolv___res_ndestroy" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_ndestroy" >&5
+$as_echo "$ac_cv_lib_resolv___res_ndestroy" >&6; }
+if test "x$ac_cv_lib_resolv___res_ndestroy" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -79988,10 +75350,10 @@
 
 
 
-printf "%s\n" "#define HAVE_RES_NDESTROY 1" >>confdefs.h
+$as_echo "#define HAVE_RES_NDESTROY 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h
+$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_res_ndestroy=yes
   else
@@ -80000,140 +75362,118 @@
   unset ac_cv_lib_bind_res_ndestroy
   unset ac_cv_lib_bind___res_ndestroy
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy in -lbind" >&5
-printf %s "checking for res_ndestroy in -lbind... " >&6; }
-if test ${ac_cv_lib_bind_res_ndestroy+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy in -lbind" >&5
+$as_echo_n "checking for res_ndestroy in -lbind... " >&6; }
+if ${ac_cv_lib_bind_res_ndestroy+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char res_ndestroy (void);
+char res_ndestroy ();
 int
-main (void)
+main ()
 {
 return res_ndestroy ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind_res_ndestroy=yes
-else case e in #(
-  e) ac_cv_lib_bind_res_ndestroy=no ;;
-esac
+else
+  ac_cv_lib_bind_res_ndestroy=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_ndestroy" >&5
-printf "%s\n" "$ac_cv_lib_bind_res_ndestroy" >&6; }
-if test "x$ac_cv_lib_bind_res_ndestroy" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_ndestroy" >&5
+$as_echo "$ac_cv_lib_bind_res_ndestroy" >&6; }
+if test "x$ac_cv_lib_bind_res_ndestroy" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_ndestroy in -lbind" >&5
-printf %s "checking for __res_ndestroy in -lbind... " >&6; }
-if test ${ac_cv_lib_bind___res_ndestroy+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_ndestroy in -lbind" >&5
+$as_echo_n "checking for __res_ndestroy in -lbind... " >&6; }
+if ${ac_cv_lib_bind___res_ndestroy+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __res_ndestroy (void);
+char __res_ndestroy ();
 int
-main (void)
+main ()
 {
 return __res_ndestroy ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind___res_ndestroy=yes
-else case e in #(
-  e) ac_cv_lib_bind___res_ndestroy=no ;;
-esac
+else
+  ac_cv_lib_bind___res_ndestroy=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_ndestroy" >&5
-printf "%s\n" "$ac_cv_lib_bind___res_ndestroy" >&6; }
-if test "x$ac_cv_lib_bind___res_ndestroy" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_ndestroy" >&5
+$as_echo "$ac_cv_lib_bind___res_ndestroy" >&6; }
+if test "x$ac_cv_lib_bind___res_ndestroy" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -80151,10 +75491,10 @@
 
 
 
-printf "%s\n" "#define HAVE_RES_NDESTROY 1" >>confdefs.h
+$as_echo "#define HAVE_RES_NDESTROY 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBBIND 1" >>confdefs.h
+$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_res_ndestroy=yes
   else
@@ -80163,140 +75503,118 @@
   unset ac_cv_lib_socket_res_ndestroy
   unset ac_cv_lib_socket___res_ndestroy
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy in -lsocket" >&5
-printf %s "checking for res_ndestroy in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket_res_ndestroy+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_ndestroy in -lsocket" >&5
+$as_echo_n "checking for res_ndestroy in -lsocket... " >&6; }
+if ${ac_cv_lib_socket_res_ndestroy+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char res_ndestroy (void);
+char res_ndestroy ();
 int
-main (void)
+main ()
 {
 return res_ndestroy ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_res_ndestroy=yes
-else case e in #(
-  e) ac_cv_lib_socket_res_ndestroy=no ;;
-esac
+else
+  ac_cv_lib_socket_res_ndestroy=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_ndestroy" >&5
-printf "%s\n" "$ac_cv_lib_socket_res_ndestroy" >&6; }
-if test "x$ac_cv_lib_socket_res_ndestroy" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_ndestroy" >&5
+$as_echo "$ac_cv_lib_socket_res_ndestroy" >&6; }
+if test "x$ac_cv_lib_socket_res_ndestroy" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_ndestroy in -lsocket" >&5
-printf %s "checking for __res_ndestroy in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket___res_ndestroy+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_ndestroy in -lsocket" >&5
+$as_echo_n "checking for __res_ndestroy in -lsocket... " >&6; }
+if ${ac_cv_lib_socket___res_ndestroy+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __res_ndestroy (void);
+char __res_ndestroy ();
 int
-main (void)
+main ()
 {
 return __res_ndestroy ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___res_ndestroy=yes
-else case e in #(
-  e) ac_cv_lib_socket___res_ndestroy=no ;;
-esac
+else
+  ac_cv_lib_socket___res_ndestroy=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_ndestroy" >&5
-printf "%s\n" "$ac_cv_lib_socket___res_ndestroy" >&6; }
-if test "x$ac_cv_lib_socket___res_ndestroy" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_ndestroy" >&5
+$as_echo "$ac_cv_lib_socket___res_ndestroy" >&6; }
+if test "x$ac_cv_lib_socket___res_ndestroy" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -80314,10 +75632,10 @@
 
 
 
-printf "%s\n" "#define HAVE_RES_NDESTROY 1" >>confdefs.h
+$as_echo "#define HAVE_RES_NDESTROY 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_res_ndestroy=yes
   else
@@ -80342,27 +75660,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "dns_search" "ac_cv_func_dns_search"
-if test "x$ac_cv_func_dns_search" = xyes
-then :
+if test "x$ac_cv_func_dns_search" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__dns_search" "ac_cv_func___dns_search"
-if test "x$ac_cv_func___dns_search" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__dns_search" "ac_cv_func___dns_search"
+if test "x$ac_cv_func___dns_search" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_DNS_SEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_DNS_SEARCH 1" >>confdefs.h
 
     ac_cv_func_dns_search=yes
   ;;
@@ -80372,140 +75686,118 @@
   unset ac_cv_lib_resolv_dns_search
   unset ac_cv_lib_resolv___dns_search
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lresolv" >&5
-printf %s "checking for dns_search in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv_dns_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_resolv_dns_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dns_search (void);
+char dns_search ();
 int
-main (void)
+main ()
 {
 return dns_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv_dns_search=yes
-else case e in #(
-  e) ac_cv_lib_resolv_dns_search=no ;;
-esac
+else
+  ac_cv_lib_resolv_dns_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dns_search" >&5
-printf "%s\n" "$ac_cv_lib_resolv_dns_search" >&6; }
-if test "x$ac_cv_lib_resolv_dns_search" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lresolv" >&5
-printf %s "checking for __dns_search in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv___dns_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $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 ${ac_cv_lib_resolv___dns_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dns_search (void);
+char __dns_search ();
 int
-main (void)
+main ()
 {
 return __dns_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv___dns_search=yes
-else case e in #(
-  e) ac_cv_lib_resolv___dns_search=no ;;
-esac
+else
+  ac_cv_lib_resolv___dns_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dns_search" >&5
-printf "%s\n" "$ac_cv_lib_resolv___dns_search" >&6; }
-if test "x$ac_cv_lib_resolv___dns_search" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -80523,10 +75815,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DNS_SEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_DNS_SEARCH 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h
+$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_dns_search=yes
   else
@@ -80535,140 +75827,118 @@
   unset ac_cv_lib_bind_dns_search
   unset ac_cv_lib_bind___dns_search
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lbind" >&5
-printf %s "checking for dns_search in -lbind... " >&6; }
-if test ${ac_cv_lib_bind_dns_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_bind_dns_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dns_search (void);
+char dns_search ();
 int
-main (void)
+main ()
 {
 return dns_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind_dns_search=yes
-else case e in #(
-  e) ac_cv_lib_bind_dns_search=no ;;
-esac
+else
+  ac_cv_lib_bind_dns_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dns_search" >&5
-printf "%s\n" "$ac_cv_lib_bind_dns_search" >&6; }
-if test "x$ac_cv_lib_bind_dns_search" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lbind" >&5
-printf %s "checking for __dns_search in -lbind... " >&6; }
-if test ${ac_cv_lib_bind___dns_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $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 ${ac_cv_lib_bind___dns_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dns_search (void);
+char __dns_search ();
 int
-main (void)
+main ()
 {
 return __dns_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind___dns_search=yes
-else case e in #(
-  e) ac_cv_lib_bind___dns_search=no ;;
-esac
+else
+  ac_cv_lib_bind___dns_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dns_search" >&5
-printf "%s\n" "$ac_cv_lib_bind___dns_search" >&6; }
-if test "x$ac_cv_lib_bind___dns_search" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -80686,10 +75956,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DNS_SEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_DNS_SEARCH 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBBIND 1" >>confdefs.h
+$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_dns_search=yes
   else
@@ -80698,140 +75968,118 @@
   unset ac_cv_lib_socket_dns_search
   unset ac_cv_lib_socket___dns_search
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dns_search in -lsocket" >&5
-printf %s "checking for dns_search in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket_dns_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_socket_dns_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dns_search (void);
+char dns_search ();
 int
-main (void)
+main ()
 {
 return dns_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_dns_search=yes
-else case e in #(
-  e) ac_cv_lib_socket_dns_search=no ;;
-esac
+else
+  ac_cv_lib_socket_dns_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dns_search" >&5
-printf "%s\n" "$ac_cv_lib_socket_dns_search" >&6; }
-if test "x$ac_cv_lib_socket_dns_search" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dns_search in -lsocket" >&5
-printf %s "checking for __dns_search in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket___dns_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $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 ${ac_cv_lib_socket___dns_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dns_search (void);
+char __dns_search ();
 int
-main (void)
+main ()
 {
 return __dns_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___dns_search=yes
-else case e in #(
-  e) ac_cv_lib_socket___dns_search=no ;;
-esac
+else
+  ac_cv_lib_socket___dns_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dns_search" >&5
-printf "%s\n" "$ac_cv_lib_socket___dns_search" >&6; }
-if test "x$ac_cv_lib_socket___dns_search" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -80849,10 +76097,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DNS_SEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_DNS_SEARCH 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_dns_search=yes
   else
@@ -80877,27 +76125,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "dn_expand" "ac_cv_func_dn_expand"
-if test "x$ac_cv_func_dn_expand" = xyes
-then :
+if test "x$ac_cv_func_dn_expand" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__dn_expand" "ac_cv_func___dn_expand"
-if test "x$ac_cv_func___dn_expand" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__dn_expand" "ac_cv_func___dn_expand"
+if test "x$ac_cv_func___dn_expand" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_DN_EXPAND 1" >>confdefs.h
+$as_echo "#define HAVE_DN_EXPAND 1" >>confdefs.h
 
     ac_cv_func_dn_expand=yes
   ;;
@@ -80907,140 +76151,118 @@
   unset ac_cv_lib_resolv_dn_expand
   unset ac_cv_lib_resolv___dn_expand
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lresolv" >&5
-printf %s "checking for dn_expand in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv_dn_expand+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_resolv_dn_expand+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dn_expand (void);
+char dn_expand ();
 int
-main (void)
+main ()
 {
 return dn_expand ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv_dn_expand=yes
-else case e in #(
-  e) ac_cv_lib_resolv_dn_expand=no ;;
-esac
+else
+  ac_cv_lib_resolv_dn_expand=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dn_expand" >&5
-printf "%s\n" "$ac_cv_lib_resolv_dn_expand" >&6; }
-if test "x$ac_cv_lib_resolv_dn_expand" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lresolv" >&5
-printf %s "checking for __dn_expand in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv___dn_expand+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $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 ${ac_cv_lib_resolv___dn_expand+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dn_expand (void);
+char __dn_expand ();
 int
-main (void)
+main ()
 {
 return __dn_expand ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv___dn_expand=yes
-else case e in #(
-  e) ac_cv_lib_resolv___dn_expand=no ;;
-esac
+else
+  ac_cv_lib_resolv___dn_expand=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_expand" >&5
-printf "%s\n" "$ac_cv_lib_resolv___dn_expand" >&6; }
-if test "x$ac_cv_lib_resolv___dn_expand" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -81058,10 +76280,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DN_EXPAND 1" >>confdefs.h
+$as_echo "#define HAVE_DN_EXPAND 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h
+$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_dn_expand=yes
   else
@@ -81070,140 +76292,118 @@
   unset ac_cv_lib_bind_dn_expand
   unset ac_cv_lib_bind___dn_expand
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lbind" >&5
-printf %s "checking for dn_expand in -lbind... " >&6; }
-if test ${ac_cv_lib_bind_dn_expand+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_bind_dn_expand+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dn_expand (void);
+char dn_expand ();
 int
-main (void)
+main ()
 {
 return dn_expand ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind_dn_expand=yes
-else case e in #(
-  e) ac_cv_lib_bind_dn_expand=no ;;
-esac
+else
+  ac_cv_lib_bind_dn_expand=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dn_expand" >&5
-printf "%s\n" "$ac_cv_lib_bind_dn_expand" >&6; }
-if test "x$ac_cv_lib_bind_dn_expand" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lbind" >&5
-printf %s "checking for __dn_expand in -lbind... " >&6; }
-if test ${ac_cv_lib_bind___dn_expand+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $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 ${ac_cv_lib_bind___dn_expand+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dn_expand (void);
+char __dn_expand ();
 int
-main (void)
+main ()
 {
 return __dn_expand ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind___dn_expand=yes
-else case e in #(
-  e) ac_cv_lib_bind___dn_expand=no ;;
-esac
+else
+  ac_cv_lib_bind___dn_expand=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dn_expand" >&5
-printf "%s\n" "$ac_cv_lib_bind___dn_expand" >&6; }
-if test "x$ac_cv_lib_bind___dn_expand" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -81221,10 +76421,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DN_EXPAND 1" >>confdefs.h
+$as_echo "#define HAVE_DN_EXPAND 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBBIND 1" >>confdefs.h
+$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_dn_expand=yes
   else
@@ -81233,140 +76433,118 @@
   unset ac_cv_lib_socket_dn_expand
   unset ac_cv_lib_socket___dn_expand
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lsocket" >&5
-printf %s "checking for dn_expand in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket_dn_expand+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_socket_dn_expand+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dn_expand (void);
+char dn_expand ();
 int
-main (void)
+main ()
 {
 return dn_expand ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_dn_expand=yes
-else case e in #(
-  e) ac_cv_lib_socket_dn_expand=no ;;
-esac
+else
+  ac_cv_lib_socket_dn_expand=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dn_expand" >&5
-printf "%s\n" "$ac_cv_lib_socket_dn_expand" >&6; }
-if test "x$ac_cv_lib_socket_dn_expand" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dn_expand in -lsocket" >&5
-printf %s "checking for __dn_expand in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket___dn_expand+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $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 ${ac_cv_lib_socket___dn_expand+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dn_expand (void);
+char __dn_expand ();
 int
-main (void)
+main ()
 {
 return __dn_expand ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___dn_expand=yes
-else case e in #(
-  e) ac_cv_lib_socket___dn_expand=no ;;
-esac
+else
+  ac_cv_lib_socket___dn_expand=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dn_expand" >&5
-printf "%s\n" "$ac_cv_lib_socket___dn_expand" >&6; }
-if test "x$ac_cv_lib_socket___dn_expand" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -81384,10 +76562,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DN_EXPAND 1" >>confdefs.h
+$as_echo "#define HAVE_DN_EXPAND 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_dn_expand=yes
   else
@@ -81412,27 +76590,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "dn_skipname" "ac_cv_func_dn_skipname"
-if test "x$ac_cv_func_dn_skipname" = xyes
-then :
+if test "x$ac_cv_func_dn_skipname" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__dn_skipname" "ac_cv_func___dn_skipname"
-if test "x$ac_cv_func___dn_skipname" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__dn_skipname" "ac_cv_func___dn_skipname"
+if test "x$ac_cv_func___dn_skipname" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
+$as_echo "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
 
     ac_cv_func_dn_skipname=yes
   ;;
@@ -81442,140 +76616,118 @@
   unset ac_cv_lib_resolv_dn_skipname
   unset ac_cv_lib_resolv___dn_skipname
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lresolv" >&5
-printf %s "checking for dn_skipname in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv_dn_skipname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_resolv_dn_skipname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dn_skipname (void);
+char dn_skipname ();
 int
-main (void)
+main ()
 {
 return dn_skipname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv_dn_skipname=yes
-else case e in #(
-  e) ac_cv_lib_resolv_dn_skipname=no ;;
-esac
+else
+  ac_cv_lib_resolv_dn_skipname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_dn_skipname" >&5
-printf "%s\n" "$ac_cv_lib_resolv_dn_skipname" >&6; }
-if test "x$ac_cv_lib_resolv_dn_skipname" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lresolv" >&5
-printf %s "checking for __dn_skipname in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv___dn_skipname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $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 ${ac_cv_lib_resolv___dn_skipname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dn_skipname (void);
+char __dn_skipname ();
 int
-main (void)
+main ()
 {
 return __dn_skipname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv___dn_skipname=yes
-else case e in #(
-  e) ac_cv_lib_resolv___dn_skipname=no ;;
-esac
+else
+  ac_cv_lib_resolv___dn_skipname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___dn_skipname" >&5
-printf "%s\n" "$ac_cv_lib_resolv___dn_skipname" >&6; }
-if test "x$ac_cv_lib_resolv___dn_skipname" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -81593,10 +76745,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
+$as_echo "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h
+$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_dn_skipname=yes
   else
@@ -81605,140 +76757,118 @@
   unset ac_cv_lib_bind_dn_skipname
   unset ac_cv_lib_bind___dn_skipname
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lbind" >&5
-printf %s "checking for dn_skipname in -lbind... " >&6; }
-if test ${ac_cv_lib_bind_dn_skipname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_bind_dn_skipname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dn_skipname (void);
+char dn_skipname ();
 int
-main (void)
+main ()
 {
 return dn_skipname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind_dn_skipname=yes
-else case e in #(
-  e) ac_cv_lib_bind_dn_skipname=no ;;
-esac
+else
+  ac_cv_lib_bind_dn_skipname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_dn_skipname" >&5
-printf "%s\n" "$ac_cv_lib_bind_dn_skipname" >&6; }
-if test "x$ac_cv_lib_bind_dn_skipname" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lbind" >&5
-printf %s "checking for __dn_skipname in -lbind... " >&6; }
-if test ${ac_cv_lib_bind___dn_skipname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $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 ${ac_cv_lib_bind___dn_skipname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dn_skipname (void);
+char __dn_skipname ();
 int
-main (void)
+main ()
 {
 return __dn_skipname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind___dn_skipname=yes
-else case e in #(
-  e) ac_cv_lib_bind___dn_skipname=no ;;
-esac
+else
+  ac_cv_lib_bind___dn_skipname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___dn_skipname" >&5
-printf "%s\n" "$ac_cv_lib_bind___dn_skipname" >&6; }
-if test "x$ac_cv_lib_bind___dn_skipname" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -81756,10 +76886,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
+$as_echo "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBBIND 1" >>confdefs.h
+$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_dn_skipname=yes
   else
@@ -81768,140 +76898,118 @@
   unset ac_cv_lib_socket_dn_skipname
   unset ac_cv_lib_socket___dn_skipname
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dn_skipname in -lsocket" >&5
-printf %s "checking for dn_skipname in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket_dn_skipname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_socket_dn_skipname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dn_skipname (void);
+char dn_skipname ();
 int
-main (void)
+main ()
 {
 return dn_skipname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_dn_skipname=yes
-else case e in #(
-  e) ac_cv_lib_socket_dn_skipname=no ;;
-esac
+else
+  ac_cv_lib_socket_dn_skipname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_dn_skipname" >&5
-printf "%s\n" "$ac_cv_lib_socket_dn_skipname" >&6; }
-if test "x$ac_cv_lib_socket_dn_skipname" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __dn_skipname in -lsocket" >&5
-printf %s "checking for __dn_skipname in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket___dn_skipname+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $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 ${ac_cv_lib_socket___dn_skipname+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __dn_skipname (void);
+char __dn_skipname ();
 int
-main (void)
+main ()
 {
 return __dn_skipname ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___dn_skipname=yes
-else case e in #(
-  e) ac_cv_lib_socket___dn_skipname=no ;;
-esac
+else
+  ac_cv_lib_socket___dn_skipname=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___dn_skipname" >&5
-printf "%s\n" "$ac_cv_lib_socket___dn_skipname" >&6; }
-if test "x$ac_cv_lib_socket___dn_skipname" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -81919,10 +77027,10 @@
 
 
 
-printf "%s\n" "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
+$as_echo "#define HAVE_DN_SKIPNAME 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_dn_skipname=yes
   else
@@ -81949,27 +77057,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "res_search" "ac_cv_func_res_search"
-if test "x$ac_cv_func_res_search" = xyes
-then :
+if test "x$ac_cv_func_res_search" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__res_search" "ac_cv_func___res_search"
-if test "x$ac_cv_func___res_search" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__res_search" "ac_cv_func___res_search"
+if test "x$ac_cv_func___res_search" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_RES_SEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_RES_SEARCH 1" >>confdefs.h
 
     ac_cv_func_res_search=yes
   ;;
@@ -81979,140 +77083,118 @@
   unset ac_cv_lib_resolv_res_search
   unset ac_cv_lib_resolv___res_search
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_search in -lresolv" >&5
-printf %s "checking for res_search in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv_res_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_resolv_res_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char res_search (void);
+char res_search ();
 int
-main (void)
+main ()
 {
 return res_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv_res_search=yes
-else case e in #(
-  e) ac_cv_lib_resolv_res_search=no ;;
-esac
+else
+  ac_cv_lib_resolv_res_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_search" >&5
-printf "%s\n" "$ac_cv_lib_resolv_res_search" >&6; }
-if test "x$ac_cv_lib_resolv_res_search" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lresolv" >&5
-printf %s "checking for __res_search in -lresolv... " >&6; }
-if test ${ac_cv_lib_resolv___res_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $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 ${ac_cv_lib_resolv___res_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lresolv  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __res_search (void);
+char __res_search ();
 int
-main (void)
+main ()
 {
 return __res_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_resolv___res_search=yes
-else case e in #(
-  e) ac_cv_lib_resolv___res_search=no ;;
-esac
+else
+  ac_cv_lib_resolv___res_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_search" >&5
-printf "%s\n" "$ac_cv_lib_resolv___res_search" >&6; }
-if test "x$ac_cv_lib_resolv___res_search" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -82130,10 +77212,10 @@
 
 
 
-printf "%s\n" "#define HAVE_RES_SEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_RES_SEARCH 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBRESOLV 1" >>confdefs.h
+$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h
 
     ac_cv_func_res_search=yes
   else
@@ -82142,140 +77224,118 @@
   unset ac_cv_lib_bind_res_search
   unset ac_cv_lib_bind___res_search
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_search in -lbind" >&5
-printf %s "checking for res_search in -lbind... " >&6; }
-if test ${ac_cv_lib_bind_res_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_bind_res_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char res_search (void);
+char res_search ();
 int
-main (void)
+main ()
 {
 return res_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind_res_search=yes
-else case e in #(
-  e) ac_cv_lib_bind_res_search=no ;;
-esac
+else
+  ac_cv_lib_bind_res_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind_res_search" >&5
-printf "%s\n" "$ac_cv_lib_bind_res_search" >&6; }
-if test "x$ac_cv_lib_bind_res_search" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lbind" >&5
-printf %s "checking for __res_search in -lbind... " >&6; }
-if test ${ac_cv_lib_bind___res_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $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 ${ac_cv_lib_bind___res_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbind  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __res_search (void);
+char __res_search ();
 int
-main (void)
+main ()
 {
 return __res_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_bind___res_search=yes
-else case e in #(
-  e) ac_cv_lib_bind___res_search=no ;;
-esac
+else
+  ac_cv_lib_bind___res_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bind___res_search" >&5
-printf "%s\n" "$ac_cv_lib_bind___res_search" >&6; }
-if test "x$ac_cv_lib_bind___res_search" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -82293,10 +77353,10 @@
 
 
 
-printf "%s\n" "#define HAVE_RES_SEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_RES_SEARCH 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBBIND 1" >>confdefs.h
+$as_echo "#define HAVE_LIBBIND 1" >>confdefs.h
 
     ac_cv_func_res_search=yes
   else
@@ -82305,140 +77365,118 @@
   unset ac_cv_lib_socket_res_search
   unset ac_cv_lib_socket___res_search
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for res_search in -lsocket" >&5
-printf %s "checking for res_search in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket_res_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $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 ${ac_cv_lib_socket_res_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char res_search (void);
+char res_search ();
 int
-main (void)
+main ()
 {
 return res_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket_res_search=yes
-else case e in #(
-  e) ac_cv_lib_socket_res_search=no ;;
-esac
+else
+  ac_cv_lib_socket_res_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_res_search" >&5
-printf "%s\n" "$ac_cv_lib_socket_res_search" >&6; }
-if test "x$ac_cv_lib_socket_res_search" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __res_search in -lsocket" >&5
-printf %s "checking for __res_search in -lsocket... " >&6; }
-if test ${ac_cv_lib_socket___res_search+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $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 ${ac_cv_lib_socket___res_search+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __res_search (void);
+char __res_search ();
 int
-main (void)
+main ()
 {
 return __res_search ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_socket___res_search=yes
-else case e in #(
-  e) ac_cv_lib_socket___res_search=no ;;
-esac
+else
+  ac_cv_lib_socket___res_search=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket___res_search" >&5
-printf "%s\n" "$ac_cv_lib_socket___res_search" >&6; }
-if test "x$ac_cv_lib_socket___res_search" = xyes
-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" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -82456,10 +77494,10 @@
 
 
 
-printf "%s\n" "#define HAVE_RES_SEARCH 1" >>confdefs.h
+$as_echo "#define HAVE_RES_SEARCH 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBSOCKET 1" >>confdefs.h
+$as_echo "#define HAVE_LIBSOCKET 1" >>confdefs.h
 
     ac_cv_func_res_search=yes
   else
@@ -82479,20 +77517,19 @@
   esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether strptime() declaration fails" >&5
-printf %s "checking whether strptime() declaration fails... " >&6; }
-if test ${ac_cv_strptime_decl_fails+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strptime() declaration fails" >&5
+$as_echo_n "checking whether strptime() declaration fails... " >&6; }
+if ${ac_cv_strptime_decl_fails+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <time.h>
 
 int
-main (void)
+main ()
 {
 
 #ifndef HAVE_STRPTIME
@@ -82506,68 +77543,69 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
   ac_cv_strptime_decl_fails=no
 
-else case e in #(
-  e)
+else
+
   ac_cv_strptime_decl_fails=yes
- ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_strptime_decl_fails" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_STRPTIME_DECL_FAILS 1" >>confdefs.h
+$as_echo "#define HAVE_STRPTIME_DECL_FAILS 1" >>confdefs.h
 
 fi
 
-ac_fn_check_decl "$LINENO" "arc4random_buf" "ac_cv_have_decl_arc4random_buf" "$ac_includes_default" "$ac_c_undeclared_builtin_options" "CFLAGS"
-if test "x$ac_cv_have_decl_arc4random_buf" = xyes
-then :
+ac_fn_c_check_decl "$LINENO" "arc4random_buf" "ac_cv_have_decl_arc4random_buf" "$ac_includes_default"
+if test "x$ac_cv_have_decl_arc4random_buf" = xyes; then :
   ac_have_decl=1
-else case e in #(
-  e) ac_have_decl=0 ;;
-esac
+else
+  ac_have_decl=0
 fi
-printf "%s\n" "#define HAVE_DECL_ARC4RANDOM_BUF $ac_have_decl" >>confdefs.h
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_ARC4RANDOM_BUF $ac_have_decl
+_ACEOF
 
 
-ac_fn_c_check_header_compile "$LINENO" "CommonCrypto/CommonRandom.h" "ac_cv_header_CommonCrypto_CommonRandom_h" "
+for ac_header in CommonCrypto/CommonRandom.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "CommonCrypto/CommonRandom.h" "ac_cv_header_CommonCrypto_CommonRandom_h" "
 	#include <sys/types.h>
 	#include <Availability.h>
 	#include <CommonCrypto/CommonCryptoError.h>
 
 "
-if test "x$ac_cv_header_CommonCrypto_CommonRandom_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_COMMONCRYPTO_COMMONRANDOM_H 1" >>confdefs.h
+if test "x$ac_cv_header_CommonCrypto_CommonRandom_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_COMMONCRYPTO_COMMONRANDOM_H 1
+_ACEOF
 
 fi
 
+done
+
 
 
 php_with_password_argon2=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Argon2 support" >&5
-printf %s "checking for Argon2 support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Argon2 support" >&5
+$as_echo_n "checking for Argon2 support... " >&6; }
 
 # Check whether --with-password-argon2 was given.
-if test ${with_password_argon2+y}
-then :
+if test "${with_password_argon2+set}" = set; then :
   withval=$with_password_argon2; PHP_PASSWORD_ARGON2=$withval
-else case e in #(
-  e)
+else
+
   PHP_PASSWORD_ARGON2=no
   test "$PHP_ENABLE_ALL" && PHP_PASSWORD_ARGON2=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -82593,8 +77631,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -82602,17 +77640,17 @@
 if test "$PHP_PASSWORD_ARGON2" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libargon2" >&5
-printf %s "checking for libargon2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libargon2" >&5
+$as_echo_n "checking for libargon2... " >&6; }
 
 if test -n "$ARGON2_CFLAGS"; then
     pkg_cv_ARGON2_CFLAGS="$ARGON2_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libargon2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ARGON2_CFLAGS=`$PKG_CONFIG --cflags "libargon2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -82626,10 +77664,10 @@
     pkg_cv_ARGON2_LIBS="$ARGON2_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libargon2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libargon2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ARGON2_LIBS=`$PKG_CONFIG --libs "libargon2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -82643,8 +77681,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -82670,10 +77708,10 @@
 and ARGON2_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -82683,12 +77721,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	ARGON2_CFLAGS=$pkg_cv_ARGON2_CFLAGS
 	ARGON2_LIBS=$pkg_cv_ARGON2_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -82814,25 +77852,30 @@
 
 
 
-printf "%s\n" "#define HAVE_ARGON2LIB 1" >>confdefs.h
+$as_echo "#define HAVE_ARGON2LIB 1" >>confdefs.h
 
 fi
 
-ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "
+for ac_header in net/if.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "net/if.h" "ac_cv_header_net_if_h" "
   #ifdef HAVE_SYS_SOCKET_H
   #include <sys/socket.h>
   #endif
   #include <net/if.h>
 
 "
-if test "x$ac_cv_header_net_if_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_NET_IF_H 1" >>confdefs.h
+if test "x$ac_cv_header_net_if_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_NET_IF_H 1
+_ACEOF
 
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usable getifaddrs" >&5
-printf %s "checking for usable getifaddrs... " >&6; }
+done
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable getifaddrs" >&5
+$as_echo_n "checking for usable getifaddrs... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -82840,7 +77883,7 @@
   #include <ifaddrs.h>
 
 int
-main (void)
+main ()
 {
 
   struct ifaddrs *interfaces;
@@ -82852,24 +77895,22 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_have_getifaddrs=yes
-else case e in #(
-  e) ac_have_getifaddrs=no ;;
-esac
+else
+  ac_have_getifaddrs=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 if test "$ac_have_getifaddrs" = "yes" ; then
 
-printf "%s\n" "#define HAVE_GETIFADDRS 1" >>confdefs.h
+$as_echo "#define HAVE_GETIFADDRS 1" >>confdefs.h
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -83028,7 +78069,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_STANDARD 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_STANDARD 1
+_ACEOF
 
     fi
   fi
@@ -83209,18 +78252,16 @@
 
 php_enable_sysvmsg=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable System V IPC support" >&5
-printf %s "checking whether to enable System V IPC support... " >&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+y}
-then :
+if test "${enable_sysvmsg+set}" = set; then :
   enableval=$enable_sysvmsg; PHP_SYSVMSG=$enableval
-else case e in #(
-  e)
+else
+
   PHP_SYSVMSG=no
   test "$PHP_ENABLE_ALL" && PHP_SYSVMSG=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -83246,26 +78287,25 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$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
-  ac_fn_c_check_header_compile "$LINENO" "sys/msg.h" "ac_cv_header_sys_msg_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_msg_h" = xyes
-then :
+  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" = xyes; then :
+
+else
+  as_fn_error $? "Cannot enable System V IPC support, sys/msg.h is missing" "$LINENO" 5
 
-else case e in #(
-  e) as_fn_error $? "Cannot enable System V IPC support, sys/msg.h is missing" "$LINENO" 5
-   ;;
-esac
 fi
 
 
 
-printf "%s\n" "#define HAVE_SYSVMSG 1" >>confdefs.h
+
+$as_echo "#define HAVE_SYSVMSG 1" >>confdefs.h
 
 
   ext_builddir=ext/sysvmsg
@@ -83401,7 +78441,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SYSVMSG 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SYSVMSG 1
+_ACEOF
 
     fi
   fi
@@ -83530,18 +78572,16 @@
 
 php_enable_sysvsem=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable System V semaphore support" >&5
-printf %s "checking whether to enable System V semaphore support... " >&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+y}
-then :
+if test "${enable_sysvsem+set}" = set; then :
   enableval=$enable_sysvsem; PHP_SYSVSEM=$enableval
-else case e in #(
-  e)
+else
+
   PHP_SYSVSEM=no
   test "$PHP_ENABLE_ALL" && PHP_SYSVSEM=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -83567,8 +78607,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -83708,7 +78748,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SYSVSEM 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SYSVSEM 1
+_ACEOF
 
     fi
   fi
@@ -83830,15 +78872,14 @@
   fi
 
 
-printf "%s\n" "#define HAVE_SYSVSEM 1" >>confdefs.h
+$as_echo "#define HAVE_SYSVSEM 1" >>confdefs.h
 
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for union semun" >&5
-printf %s "checking for union semun... " >&6; }
-if test ${php_cv_semun+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for union semun" >&5
+$as_echo_n "checking for union semun... " >&6; }
+if ${php_cv_semun+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <sys/types.h>
@@ -83846,37 +78887,34 @@
 #include <sys/sem.h>
 
 int
-main (void)
+main ()
 {
 union semun x;
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
 
      php_cv_semun=yes
 
-else case e in #(
-  e)
+else
+
      php_cv_semun=no
-    ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_semun" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_SEMUN 1" >>confdefs.h
+$as_echo "#define HAVE_SEMUN 1" >>confdefs.h
 
  else
 
-printf "%s\n" "#define HAVE_SEMUN 0" >>confdefs.h
+$as_echo "#define HAVE_SEMUN 0" >>confdefs.h
 
  fi
 fi
@@ -83887,18 +78925,16 @@
 
 php_enable_sysvshm=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable System V shared memory support" >&5
-printf %s "checking whether to enable System V shared memory support... " >&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+y}
-then :
+if test "${enable_sysvshm+set}" = set; then :
   enableval=$enable_sysvshm; PHP_SYSVSHM=$enableval
-else case e in #(
-  e)
+else
+
   PHP_SYSVSHM=no
   test "$PHP_ENABLE_ALL" && PHP_SYSVSHM=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -83924,15 +78960,15 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$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
 
-printf "%s\n" "#define HAVE_SYSVSHM 1" >>confdefs.h
+$as_echo "#define HAVE_SYSVSHM 1" >>confdefs.h
 
 
   ext_builddir=ext/sysvshm
@@ -84068,7 +79104,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_SYSVSHM 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_SYSVSHM 1
+_ACEOF
 
     fi
   fi
@@ -84197,19 +79235,17 @@
 
 php_with_tidy=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for TIDY support" >&5
-printf %s "checking for TIDY support... " >&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+y}
-then :
+if test "${with_tidy+set}" = set; then :
   withval=$with_tidy; PHP_TIDY=$withval
-else case e in #(
-  e)
+else
+
   PHP_TIDY=no
   test "$PHP_ENABLE_ALL" && PHP_TIDY=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -84235,8 +79271,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -84270,7 +79306,7 @@
   else
                 if test -f "$TIDY_INCDIR/tidybuffio.h"; then
 
-printf "%s\n" "#define HAVE_TIDYBUFFIO_H 1" >>confdefs.h
+$as_echo "#define HAVE_TIDYBUFFIO_H 1" >>confdefs.h
 
     fi
   fi
@@ -84278,11 +79314,11 @@
   TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR
   if test "$TIDY_LIB_NAME" == 'tidyp'; then
 
-printf "%s\n" "#define HAVE_TIDYP_H 1" >>confdefs.h
+$as_echo "#define HAVE_TIDYP_H 1" >>confdefs.h
 
   else
 
-printf "%s\n" "#define HAVE_TIDY_H 1" >>confdefs.h
+$as_echo "#define HAVE_TIDY_H 1" >>confdefs.h
 
   fi
 
@@ -84392,64 +79428,56 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$TIDY_LIB_NAME""_tidyOptGetDoc" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tidyOptGetDoc in -l$TIDY_LIB_NAME" >&5
-printf %s "checking for tidyOptGetDoc in -l$TIDY_LIB_NAME... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$TIDY_LIB_NAME''_tidyOptGetDoc" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tidyOptGetDoc in -l$TIDY_LIB_NAME" >&5
+$as_echo_n "checking for tidyOptGetDoc in -l$TIDY_LIB_NAME... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$TIDY_LIB_NAME  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char tidyOptGetDoc (void);
+char tidyOptGetDoc ();
 int
-main (void)
+main ()
 {
 return tidyOptGetDoc ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_TIDYOPTGETDOC 1" >>confdefs.h
+$as_echo "#define HAVE_TIDYOPTGETDOC 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$TIDY_LIB_NAME_tidyOptGetDoc
@@ -84559,74 +79587,64 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tidyOptGetDoc in -ltidy5" >&5
-printf %s "checking for tidyOptGetDoc in -ltidy5... " >&6; }
-if test ${ac_cv_lib_tidy5_tidyOptGetDoc+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tidyOptGetDoc in -ltidy5" >&5
+$as_echo_n "checking for tidyOptGetDoc in -ltidy5... " >&6; }
+if ${ac_cv_lib_tidy5_tidyOptGetDoc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ltidy5  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char tidyOptGetDoc (void);
+char tidyOptGetDoc ();
 int
-main (void)
+main ()
 {
 return tidyOptGetDoc ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_tidy5_tidyOptGetDoc=yes
-else case e in #(
-  e) ac_cv_lib_tidy5_tidyOptGetDoc=no ;;
-esac
+else
+  ac_cv_lib_tidy5_tidyOptGetDoc=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tidy5_tidyOptGetDoc" >&5
-printf "%s\n" "$ac_cv_lib_tidy5_tidyOptGetDoc" >&6; }
-if test "x$ac_cv_lib_tidy5_tidyOptGetDoc" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tidy5_tidyOptGetDoc" >&5
+$as_echo "$ac_cv_lib_tidy5_tidyOptGetDoc" >&6; }
+if test "x$ac_cv_lib_tidy5_tidyOptGetDoc" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
       TIDY_LIB_NAME=tidy5
 
-printf "%s\n" "#define HAVE_TIDYOPTGETDOC 1" >>confdefs.h
+$as_echo "#define HAVE_TIDYOPTGETDOC 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_tidy5_tidyOptGetDoc
 
-   ;;
-esac
+
 fi
 
 
-   ;;
-esac
+
 fi
 
 
@@ -84735,70 +79753,61 @@
     esac
   done
 
-  as_ac_Lib=`printf "%s\n" "ac_cv_lib_$TIDY_LIB_NAME""_tidyReleaseDate" | sed "$as_sed_sh"`
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for tidyReleaseDate in -l$TIDY_LIB_NAME" >&5
-printf %s "checking for tidyReleaseDate in -l$TIDY_LIB_NAME... " >&6; }
-if eval test \${$as_ac_Lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  as_ac_Lib=`$as_echo "ac_cv_lib_$TIDY_LIB_NAME''_tidyReleaseDate" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tidyReleaseDate in -l$TIDY_LIB_NAME" >&5
+$as_echo_n "checking for tidyReleaseDate in -l$TIDY_LIB_NAME... " >&6; }
+if eval \${$as_ac_Lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-l$TIDY_LIB_NAME  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char tidyReleaseDate (void);
+char tidyReleaseDate ();
 int
-main (void)
+main ()
 {
 return tidyReleaseDate ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   eval "$as_ac_Lib=yes"
-else case e in #(
-  e) eval "$as_ac_Lib=no" ;;
-esac
+else
+  eval "$as_ac_Lib=no"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
 eval ac_res=\$$as_ac_Lib
-	       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-printf "%s\n" "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"
-then :
+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_TIDYRELEASEDATE 1" >>confdefs.h
+$as_echo "#define HAVE_TIDYRELEASEDATE 1" >>confdefs.h
 
 
 
-else case e in #(
-  e)
+else
+
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_$TIDY_LIB_NAME_tidyReleaseDate
 
-   ;;
-esac
+
 fi
 
 
@@ -85066,7 +80075,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_TIDY 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_TIDY 1
+_ACEOF
 
     fi
   fi
@@ -85191,7 +80202,7 @@
   PHP_VAR_SUBST="$PHP_VAR_SUBST TIDY_SHARED_LIBADD"
 
 
-printf "%s\n" "#define HAVE_TIDY 1" >>confdefs.h
+$as_echo "#define HAVE_TIDY 1" >>confdefs.h
 
 fi
 
@@ -85201,18 +80212,16 @@
 
 php_enable_tokenizer=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable tokenizer support" >&5
-printf %s "checking whether to enable tokenizer support... " >&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+y}
-then :
+if test "${enable_tokenizer+set}" = set; then :
   enableval=$enable_tokenizer; PHP_TOKENIZER=$enableval
-else case e in #(
-  e)
+else
+
   PHP_TOKENIZER=yes
   test "$PHP_ENABLE_ALL" && PHP_TOKENIZER=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -85238,8 +80247,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -85379,7 +80388,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_TOKENIZER 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_TOKENIZER 1
+_ACEOF
 
     fi
   fi
@@ -85514,18 +80525,16 @@
 
 php_enable_xml=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable XML support" >&5
-printf %s "checking whether to enable XML support... " >&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+y}
-then :
+if test "${enable_xml+set}" = set; then :
   enableval=$enable_xml; PHP_XML=$enableval
-else case e in #(
-  e)
+else
+
   PHP_XML=yes
   test "$PHP_ENABLE_ALL" && PHP_XML=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -85551,8 +80560,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -85560,25 +80569,23 @@
 
 php_with_expat=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with expat support" >&5
-printf %s "checking whether to build with expat support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with expat support" >&5
+$as_echo_n "checking whether to build with expat support... " >&6; }
 
 # Check whether --with-expat was given.
-if test ${with_expat+y}
-then :
+if test "${with_expat+set}" = set; then :
   withval=$with_expat; PHP_EXPAT=$withval
-else case e in #(
-  e)
+else
+
   PHP_EXPAT=no
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_EXPAT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -85594,17 +80601,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
-printf %s "checking for libxml-2.0 >= 2.9.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
+$as_echo_n "checking for libxml-2.0 >= 2.9.0... " >&6; }
 
 if test -n "$LIBXML_CFLAGS"; then
     pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -85618,10 +80625,10 @@
     pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -85635,8 +80642,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -85662,10 +80669,10 @@
 and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -85675,12 +80682,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
 	LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -85825,7 +80832,7 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
 
 
@@ -85855,17 +80862,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for expat" >&5
-printf %s "checking for expat... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for expat" >&5
+$as_echo_n "checking for expat... " >&6; }
 
 if test -n "$EXPAT_CFLAGS"; then
     pkg_cv_EXPAT_CFLAGS="$EXPAT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"expat\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"expat\""; } >&5
   ($PKG_CONFIG --exists --print-errors "expat") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EXPAT_CFLAGS=`$PKG_CONFIG --cflags "expat" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -85879,10 +80886,10 @@
     pkg_cv_EXPAT_LIBS="$EXPAT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"expat\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"expat\""; } >&5
   ($PKG_CONFIG --exists --print-errors "expat") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EXPAT_LIBS=`$PKG_CONFIG --libs "expat" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -85896,8 +80903,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -85923,10 +80930,10 @@
 and EXPAT_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -85936,12 +80943,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	EXPAT_CFLAGS=$pkg_cv_EXPAT_CFLAGS
 	EXPAT_LIBS=$pkg_cv_EXPAT_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -86086,7 +81093,7 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBEXPAT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBEXPAT 1" >>confdefs.h
 
 
   fi
@@ -86225,7 +81232,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_XML 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_XML 1
+_ACEOF
 
     fi
   fi
@@ -86368,7 +81377,7 @@
 
 
 
-printf "%s\n" "#define HAVE_XML 1" >>confdefs.h
+$as_echo "#define HAVE_XML 1" >>confdefs.h
 
 fi
 
@@ -86378,18 +81387,16 @@
 
 php_enable_xmlreader=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable XMLReader support" >&5
-printf %s "checking whether to enable XMLReader support... " >&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+y}
-then :
+if test "${enable_xmlreader+set}" = set; then :
   enableval=$enable_xmlreader; PHP_XMLREADER=$enableval
-else case e in #(
-  e)
+else
+
   PHP_XMLREADER=yes
   test "$PHP_ENABLE_ALL" && PHP_XMLREADER=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -86415,8 +81422,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -86430,17 +81437,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
-printf %s "checking for libxml-2.0 >= 2.9.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
+$as_echo_n "checking for libxml-2.0 >= 2.9.0... " >&6; }
 
 if test -n "$LIBXML_CFLAGS"; then
     pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -86454,10 +81461,10 @@
     pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -86471,8 +81478,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -86498,10 +81505,10 @@
 and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -86511,12 +81518,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
 	LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -86661,12 +81668,12 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
 
 
 
-printf "%s\n" "#define HAVE_XMLREADER 1" >>confdefs.h
+$as_echo "#define HAVE_XMLREADER 1" >>confdefs.h
 
 
   ext_builddir=ext/xmlreader
@@ -86802,7 +81809,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_XMLREADER 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_XMLREADER 1
+_ACEOF
 
     fi
   fi
@@ -86955,18 +81964,16 @@
 
 php_enable_xmlwriter=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable XMLWriter support" >&5
-printf %s "checking whether to enable XMLWriter support... " >&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+y}
-then :
+if test "${enable_xmlwriter+set}" = set; then :
   enableval=$enable_xmlwriter; PHP_XMLWRITER=$enableval
-else case e in #(
-  e)
+else
+
   PHP_XMLWRITER=yes
   test "$PHP_ENABLE_ALL" && PHP_XMLWRITER=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -86992,8 +81999,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -87007,17 +82014,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
-printf %s "checking for libxml-2.0 >= 2.9.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.9.0" >&5
+$as_echo_n "checking for libxml-2.0 >= 2.9.0... " >&6; }
 
 if test -n "$LIBXML_CFLAGS"; then
     pkg_cv_LIBXML_CFLAGS="$LIBXML_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -87031,10 +82038,10 @@
     pkg_cv_LIBXML_LIBS="$LIBXML_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0 >= 2.9.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxml-2.0 >= 2.9.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -87048,8 +82055,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -87075,10 +82082,10 @@
 and LIBXML_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -87088,12 +82095,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
 	LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -87238,12 +82245,12 @@
 
 
 
-printf "%s\n" "#define HAVE_LIBXML 1" >>confdefs.h
+$as_echo "#define HAVE_LIBXML 1" >>confdefs.h
 
 
 
 
-printf "%s\n" "#define HAVE_XMLWRITER 1" >>confdefs.h
+$as_echo "#define HAVE_XMLWRITER 1" >>confdefs.h
 
 
   ext_builddir=ext/xmlwriter
@@ -87379,7 +82386,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_XMLWRITER 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_XMLWRITER 1
+_ACEOF
 
     fi
   fi
@@ -87513,19 +82522,17 @@
 
 php_with_xsl=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build with XSL support" >&5
-printf %s "checking whether to build with XSL support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with XSL support" >&5
+$as_echo_n "checking whether to build with XSL support... " >&6; }
 
 # Check whether --with-xsl was given.
-if test ${with_xsl+y}
-then :
+if test "${with_xsl+set}" = set; then :
   withval=$with_xsl; PHP_XSL=$withval
-else case e in #(
-  e)
+else
+
   PHP_XSL=no
   test "$PHP_ENABLE_ALL" && PHP_XSL=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -87551,8 +82558,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -87569,17 +82576,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxslt >= 1.1.0" >&5
-printf %s "checking for libxslt >= 1.1.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxslt >= 1.1.0" >&5
+$as_echo_n "checking for libxslt >= 1.1.0... " >&6; }
 
 if test -n "$XSL_CFLAGS"; then
     pkg_cv_XSL_CFLAGS="$XSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt >= 1.1.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt >= 1.1.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxslt >= 1.1.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_XSL_CFLAGS=`$PKG_CONFIG --cflags "libxslt >= 1.1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -87593,10 +82600,10 @@
     pkg_cv_XSL_LIBS="$XSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt >= 1.1.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxslt >= 1.1.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libxslt >= 1.1.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_XSL_LIBS=`$PKG_CONFIG --libs "libxslt >= 1.1.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -87610,8 +82617,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -87637,10 +82644,10 @@
 and XSL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -87650,12 +82657,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	XSL_CFLAGS=$pkg_cv_XSL_CFLAGS
 	XSL_LIBS=$pkg_cv_XSL_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -87801,17 +82808,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libexslt" >&5
-printf %s "checking for libexslt... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libexslt" >&5
+$as_echo_n "checking for libexslt... " >&6; }
 
 if test -n "$EXSLT_CFLAGS"; then
     pkg_cv_EXSLT_CFLAGS="$EXSLT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexslt\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexslt\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libexslt") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EXSLT_CFLAGS=`$PKG_CONFIG --cflags "libexslt" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -87825,10 +82832,10 @@
     pkg_cv_EXSLT_LIBS="$EXSLT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexslt\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexslt\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libexslt") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_EXSLT_LIBS=`$PKG_CONFIG --libs "libexslt" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -87842,8 +82849,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -87860,14 +82867,14 @@
 
 
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 else
 	EXSLT_CFLAGS=$pkg_cv_EXSLT_CFLAGS
 	EXSLT_LIBS=$pkg_cv_EXSLT_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 
   for ac_i in $EXSLT_CFLAGS; do
@@ -88009,13 +83016,13 @@
   done
 
 
-printf "%s\n" "#define HAVE_XSL_EXSLT 1" >>confdefs.h
+$as_echo "#define HAVE_XSL_EXSLT 1" >>confdefs.h
 
 
 fi
 
 
-printf "%s\n" "#define HAVE_XSL 1" >>confdefs.h
+$as_echo "#define HAVE_XSL 1" >>confdefs.h
 
 
   ext_builddir=ext/xsl
@@ -88151,7 +83158,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_XSL 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_XSL 1
+_ACEOF
 
     fi
   fi
@@ -88321,18 +83330,16 @@
 
 php_enable_zend_test=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable zend-test extension" >&5
-printf %s "checking whether to enable zend-test extension... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable zend-test extension" >&5
+$as_echo_n "checking whether to enable zend-test extension... " >&6; }
 # Check whether --enable-zend-test was given.
-if test ${enable_zend_test+y}
-then :
+if test "${enable_zend_test+set}" = set; then :
   enableval=$enable_zend_test; PHP_ZEND_TEST=$enableval
-else case e in #(
-  e)
+else
+
   PHP_ZEND_TEST=no
   test "$PHP_ENABLE_ALL" && PHP_ZEND_TEST=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -88358,8 +83365,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -88499,7 +83506,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_ZEND_TEST 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_ZEND_TEST 1
+_ACEOF
 
     fi
   fi
@@ -88628,19 +83637,17 @@
 
 php_with_zip=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip archive read/write support" >&5
-printf %s "checking for zip archive read/write support... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip archive read/write support" >&5
+$as_echo_n "checking for zip archive read/write support... " >&6; }
 
 # Check whether --with-zip was given.
-if test ${with_zip+y}
-then :
+if test "${with_zip+set}" = set; then :
   withval=$with_zip; PHP_ZIP=$withval
-else case e in #(
-  e)
+else
+
   PHP_ZIP=no
   test "$PHP_ENABLE_ALL" && PHP_ZIP=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -88666,8 +83673,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -88675,17 +83682,17 @@
 if test "$PHP_ZIP" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0" >&5
-printf %s "checking for libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0" >&5
+$as_echo_n "checking for libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0... " >&6; }
 
 if test -n "$LIBZIP_CFLAGS"; then
     pkg_cv_LIBZIP_CFLAGS="$LIBZIP_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBZIP_CFLAGS=`$PKG_CONFIG --cflags "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -88699,10 +83706,10 @@
     pkg_cv_LIBZIP_LIBS="$LIBZIP_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0\""; } >&5
   ($PKG_CONFIG --exists --print-errors "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_LIBZIP_LIBS=`$PKG_CONFIG --libs "libzip >= 0.11 libzip != 1.3.1 libzip != 1.7.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -88716,8 +83723,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -88743,10 +83750,10 @@
 and LIBZIP_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -88756,12 +83763,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	LIBZIP_CFLAGS=$pkg_cv_LIBZIP_CFLAGS
 	LIBZIP_LIBS=$pkg_cv_LIBZIP_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -89012,71 +84019,62 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_file_set_mtime in -lzip" >&5
-printf %s "checking for zip_file_set_mtime in -lzip... " >&6; }
-if test ${ac_cv_lib_zip_zip_file_set_mtime+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip_file_set_mtime in -lzip" >&5
+$as_echo_n "checking for zip_file_set_mtime in -lzip... " >&6; }
+if ${ac_cv_lib_zip_zip_file_set_mtime+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lzip  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char zip_file_set_mtime (void);
+char zip_file_set_mtime ();
 int
-main (void)
+main ()
 {
 return zip_file_set_mtime ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_zip_zip_file_set_mtime=yes
-else case e in #(
-  e) ac_cv_lib_zip_zip_file_set_mtime=no ;;
-esac
+else
+  ac_cv_lib_zip_zip_file_set_mtime=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_file_set_mtime" >&5
-printf "%s\n" "$ac_cv_lib_zip_zip_file_set_mtime" >&6; }
-if test "x$ac_cv_lib_zip_zip_file_set_mtime" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_file_set_mtime" >&5
+$as_echo "$ac_cv_lib_zip_zip_file_set_mtime" >&6; }
+if test "x$ac_cv_lib_zip_zip_file_set_mtime" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_SET_MTIME 1" >>confdefs.h
+$as_echo "#define HAVE_SET_MTIME 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_zip_zip_file_set_mtime
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libzip >= 1.0.0 needed for setting mtime" >&5
-printf "%s\n" "$as_me: WARNING: Libzip >= 1.0.0 needed for setting mtime" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libzip >= 1.0.0 needed for setting mtime" >&5
+$as_echo "$as_me: WARNING: Libzip >= 1.0.0 needed for setting mtime" >&2;}
+
 
-   ;;
-esac
 fi
 
 
@@ -89187,71 +84185,62 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_file_set_encryption in -lzip" >&5
-printf %s "checking for zip_file_set_encryption in -lzip... " >&6; }
-if test ${ac_cv_lib_zip_zip_file_set_encryption+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip_file_set_encryption in -lzip" >&5
+$as_echo_n "checking for zip_file_set_encryption in -lzip... " >&6; }
+if ${ac_cv_lib_zip_zip_file_set_encryption+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lzip  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char zip_file_set_encryption (void);
+char zip_file_set_encryption ();
 int
-main (void)
+main ()
 {
 return zip_file_set_encryption ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_zip_zip_file_set_encryption=yes
-else case e in #(
-  e) ac_cv_lib_zip_zip_file_set_encryption=no ;;
-esac
+else
+  ac_cv_lib_zip_zip_file_set_encryption=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_file_set_encryption" >&5
-printf "%s\n" "$ac_cv_lib_zip_zip_file_set_encryption" >&6; }
-if test "x$ac_cv_lib_zip_zip_file_set_encryption" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_file_set_encryption" >&5
+$as_echo "$ac_cv_lib_zip_zip_file_set_encryption" >&6; }
+if test "x$ac_cv_lib_zip_zip_file_set_encryption" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_ENCRYPTION 1" >>confdefs.h
+$as_echo "#define HAVE_ENCRYPTION 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_zip_zip_file_set_encryption
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Libzip >= 1.2.0 needed for encryption support" >&5
-printf "%s\n" "$as_me: WARNING: Libzip >= 1.2.0 needed for encryption support" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libzip >= 1.2.0 needed for encryption support" >&5
+$as_echo "$as_me: WARNING: Libzip >= 1.2.0 needed for encryption support" >&2;}
+
 
-   ;;
-esac
 fi
 
 
@@ -89362,69 +84351,60 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_libzip_version in -lzip" >&5
-printf %s "checking for zip_libzip_version in -lzip... " >&6; }
-if test ${ac_cv_lib_zip_zip_libzip_version+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip_libzip_version in -lzip" >&5
+$as_echo_n "checking for zip_libzip_version in -lzip... " >&6; }
+if ${ac_cv_lib_zip_zip_libzip_version+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lzip  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char zip_libzip_version (void);
+char zip_libzip_version ();
 int
-main (void)
+main ()
 {
 return zip_libzip_version ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_zip_zip_libzip_version=yes
-else case e in #(
-  e) ac_cv_lib_zip_zip_libzip_version=no ;;
-esac
+else
+  ac_cv_lib_zip_zip_libzip_version=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_libzip_version" >&5
-printf "%s\n" "$ac_cv_lib_zip_zip_libzip_version" >&6; }
-if test "x$ac_cv_lib_zip_zip_libzip_version" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_libzip_version" >&5
+$as_echo "$ac_cv_lib_zip_zip_libzip_version" >&6; }
+if test "x$ac_cv_lib_zip_zip_libzip_version" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_LIBZIP_VERSION 1" >>confdefs.h
+$as_echo "#define HAVE_LIBZIP_VERSION 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_zip_zip_libzip_version
 
 
-   ;;
-esac
+
 fi
 
 
@@ -89535,69 +84515,60 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_register_progress_callback_with_state in -lzip" >&5
-printf %s "checking for zip_register_progress_callback_with_state in -lzip... " >&6; }
-if test ${ac_cv_lib_zip_zip_register_progress_callback_with_state+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip_register_progress_callback_with_state in -lzip" >&5
+$as_echo_n "checking for zip_register_progress_callback_with_state in -lzip... " >&6; }
+if ${ac_cv_lib_zip_zip_register_progress_callback_with_state+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lzip  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char zip_register_progress_callback_with_state (void);
+char zip_register_progress_callback_with_state ();
 int
-main (void)
+main ()
 {
 return zip_register_progress_callback_with_state ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_zip_zip_register_progress_callback_with_state=yes
-else case e in #(
-  e) ac_cv_lib_zip_zip_register_progress_callback_with_state=no ;;
-esac
+else
+  ac_cv_lib_zip_zip_register_progress_callback_with_state=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_register_progress_callback_with_state" >&5
-printf "%s\n" "$ac_cv_lib_zip_zip_register_progress_callback_with_state" >&6; }
-if test "x$ac_cv_lib_zip_zip_register_progress_callback_with_state" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_register_progress_callback_with_state" >&5
+$as_echo "$ac_cv_lib_zip_zip_register_progress_callback_with_state" >&6; }
+if test "x$ac_cv_lib_zip_zip_register_progress_callback_with_state" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_PROGRESS_CALLBACK 1" >>confdefs.h
+$as_echo "#define HAVE_PROGRESS_CALLBACK 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_zip_zip_register_progress_callback_with_state
 
 
-   ;;
-esac
+
 fi
 
 
@@ -89708,69 +84679,60 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_register_cancel_callback_with_state in -lzip" >&5
-printf %s "checking for zip_register_cancel_callback_with_state in -lzip... " >&6; }
-if test ${ac_cv_lib_zip_zip_register_cancel_callback_with_state+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip_register_cancel_callback_with_state in -lzip" >&5
+$as_echo_n "checking for zip_register_cancel_callback_with_state in -lzip... " >&6; }
+if ${ac_cv_lib_zip_zip_register_cancel_callback_with_state+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lzip  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char zip_register_cancel_callback_with_state (void);
+char zip_register_cancel_callback_with_state ();
 int
-main (void)
+main ()
 {
 return zip_register_cancel_callback_with_state ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_zip_zip_register_cancel_callback_with_state=yes
-else case e in #(
-  e) ac_cv_lib_zip_zip_register_cancel_callback_with_state=no ;;
-esac
+else
+  ac_cv_lib_zip_zip_register_cancel_callback_with_state=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_register_cancel_callback_with_state" >&5
-printf "%s\n" "$ac_cv_lib_zip_zip_register_cancel_callback_with_state" >&6; }
-if test "x$ac_cv_lib_zip_zip_register_cancel_callback_with_state" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_register_cancel_callback_with_state" >&5
+$as_echo "$ac_cv_lib_zip_zip_register_cancel_callback_with_state" >&6; }
+if test "x$ac_cv_lib_zip_zip_register_cancel_callback_with_state" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_CANCEL_CALLBACK 1" >>confdefs.h
+$as_echo "#define HAVE_CANCEL_CALLBACK 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_zip_zip_register_cancel_callback_with_state
 
 
-   ;;
-esac
+
 fi
 
 
@@ -89881,74 +84843,65 @@
     esac
   done
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zip_compression_method_supported in -lzip" >&5
-printf %s "checking for zip_compression_method_supported in -lzip... " >&6; }
-if test ${ac_cv_lib_zip_zip_compression_method_supported+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zip_compression_method_supported in -lzip" >&5
+$as_echo_n "checking for zip_compression_method_supported in -lzip... " >&6; }
+if ${ac_cv_lib_zip_zip_compression_method_supported+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lzip  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char zip_compression_method_supported (void);
+char zip_compression_method_supported ();
 int
-main (void)
+main ()
 {
 return zip_compression_method_supported ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_zip_zip_compression_method_supported=yes
-else case e in #(
-  e) ac_cv_lib_zip_zip_compression_method_supported=no ;;
-esac
+else
+  ac_cv_lib_zip_zip_compression_method_supported=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_compression_method_supported" >&5
-printf "%s\n" "$ac_cv_lib_zip_zip_compression_method_supported" >&6; }
-if test "x$ac_cv_lib_zip_zip_compression_method_supported" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_zip_zip_compression_method_supported" >&5
+$as_echo "$ac_cv_lib_zip_zip_compression_method_supported" >&6; }
+if test "x$ac_cv_lib_zip_zip_compression_method_supported" = xyes; then :
 
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
 
 
-printf "%s\n" "#define HAVE_METHOD_SUPPORTED 1" >>confdefs.h
+$as_echo "#define HAVE_METHOD_SUPPORTED 1" >>confdefs.h
+
 
 
+else
 
-else case e in #(
-  e)
     LDFLAGS=$save_old_LDFLAGS
     ext_shared=$save_ext_shared
     unset ac_cv_lib_zip_zip_compression_method_supported
 
 
-   ;;
-esac
+
 fi
 
 
 
-printf "%s\n" "#define HAVE_ZIP 1" >>confdefs.h
+$as_echo "#define HAVE_ZIP 1" >>confdefs.h
 
 
   PHP_ZIP_SOURCES="php_zip.c zip_stream.c"
@@ -90086,7 +85039,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_ZIP 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_ZIP 1
+_ACEOF
 
     fi
   fi
@@ -90226,18 +85181,16 @@
 
 php_enable_mysqlnd=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable mysqlnd" >&5
-printf %s "checking whether to enable mysqlnd... " >&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+y}
-then :
+if test "${enable_mysqlnd+set}" = set; then :
   enableval=$enable_mysqlnd; PHP_MYSQLND=$enableval
-else case e in #(
-  e)
+else
+
   PHP_MYSQLND=no
   test "$PHP_ENABLE_ALL" && PHP_MYSQLND=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -90263,8 +85216,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -90272,24 +85225,22 @@
 
 php_enable_mysqlnd_compression_support=yes
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to disable compressed protocol support in mysqlnd" >&5
-printf %s "checking whether to disable compressed protocol support in mysqlnd... " >&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+y}
-then :
+if test "${enable_mysqlnd_compression_support+set}" = set; then :
   enableval=$enable_mysqlnd_compression_support; PHP_MYSQLND_COMPRESSION_SUPPORT=$enableval
-else case e in #(
-  e)
+else
+
   PHP_MYSQLND_COMPRESSION_SUPPORT=yes
 
- ;;
-esac
+
 fi
 
 
 ext_output=$PHP_MYSQLND_COMPRESSION_SUPPORT
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -90306,17 +85257,17 @@
   if test "$PHP_MYSQLND_COMPRESSION_SUPPORT" != "no"; then
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5
-printf %s "checking for zlib... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib" >&5
+$as_echo_n "checking for zlib... " >&6; }
 
 if test -n "$ZLIB_CFLAGS"; then
     pkg_cv_ZLIB_CFLAGS="$ZLIB_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
   ($PKG_CONFIG --exists --print-errors "zlib") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ZLIB_CFLAGS=`$PKG_CONFIG --cflags "zlib" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -90330,10 +85281,10 @@
     pkg_cv_ZLIB_LIBS="$ZLIB_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"zlib\""; } >&5
   ($PKG_CONFIG --exists --print-errors "zlib") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_ZLIB_LIBS=`$PKG_CONFIG --libs "zlib" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -90347,8 +85298,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -90374,10 +85325,10 @@
 and ZLIB_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -90387,12 +85338,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	ZLIB_CFLAGS=$pkg_cv_ZLIB_CFLAGS
 	ZLIB_LIBS=$pkg_cv_ZLIB_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
 fi
 
@@ -90535,12 +85486,12 @@
   done
 
 
-printf "%s\n" "#define MYSQLND_COMPRESSION_ENABLED 1" >>confdefs.h
+$as_echo "#define MYSQLND_COMPRESSION_ENABLED 1" >>confdefs.h
 
   fi
 
 
-printf "%s\n" "#define MYSQLND_SSL_SUPPORTED 1" >>confdefs.h
+$as_echo "#define MYSQLND_SSL_SUPPORTED 1" >>confdefs.h
 
 
   test -z "$PHP_OPENSSL" && PHP_OPENSSL=no
@@ -90551,17 +85502,17 @@
 
 
 pkg_failed=no
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
-printf %s "checking for openssl >= 1.0.2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl >= 1.0.2" >&5
+$as_echo_n "checking for openssl >= 1.0.2... " >&6; }
 
 if test -n "$OPENSSL_CFLAGS"; then
     pkg_cv_OPENSSL_CFLAGS="$OPENSSL_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -90575,10 +85526,10 @@
     pkg_cv_OPENSSL_LIBS="$OPENSSL_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"openssl >= 1.0.2\""; } >&5
   ($PKG_CONFIG --exists --print-errors "openssl >= 1.0.2") 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl >= 1.0.2" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
@@ -90592,8 +85543,8 @@
 
 
 if test $pkg_failed = yes; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
         _pkg_short_errors_supported=yes
@@ -90619,10 +85570,10 @@
 and OPENSSL_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -90632,12 +85583,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See 'config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	OPENSSL_CFLAGS=$pkg_cv_OPENSSL_CFLAGS
 	OPENSSL_LIBS=$pkg_cv_OPENSSL_LIBS
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 	found_openssl=yes
 fi
 
@@ -90782,7 +85733,7 @@
   done
 
 
-printf "%s\n" "#define MYSQLND_HAVE_SSL 1" >>confdefs.h
+$as_echo "#define MYSQLND_HAVE_SSL 1" >>confdefs.h
 
 
   fi
@@ -90924,7 +85875,9 @@
 EOF
 
 
-printf "%s\n" "#define COMPILE_DL_MYSQLND 1" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define COMPILE_DL_MYSQLND 1
+_ACEOF
 
     fi
   fi
@@ -91083,84 +86036,76 @@
 
 case $host_alias in
   i[3456]86-*-linux-* | x86_64-*-linux-*)
-	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking linker support for -zcommon-page-size=2097152" >&5
-printf %s "checking linker support for -zcommon-page-size=2097152... " >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking linker support for -zcommon-page-size=2097152" >&5
+$as_echo_n "checking linker support for -zcommon-page-size=2097152... " >&6; }
     save_LDFLAGS=$LDFLAGS
     LDFLAGS="$LDFLAGS -Wl,-zcommon-page-size=2097152 -Wl,-zmax-page-size=2097152"
-    if test "$cross_compiling" = yes
-then :
+    if test "$cross_compiling" = yes; then :
   ac_cv_common_page_size=no
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_common_page_size=yes
-else case e in #(
-  e) ac_cv_common_page_size=no ;;
-esac
+else
+  ac_cv_common_page_size=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LDFLAGS=$save_LDFLAGS
     if test "$ac_cv_common_page_size" = "yes"; then
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
         EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM -Wl,-zcommon-page-size=2097152 -Wl,-zmax-page-size=2097152"
     else
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
-        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking linker support for -zmax-page-size=2097152" >&5
-printf %s "checking linker support for -zmax-page-size=2097152... " >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking linker support for -zmax-page-size=2097152" >&5
+$as_echo_n "checking linker support for -zmax-page-size=2097152... " >&6; }
         save_LDFLAGS=$LDFLAGS
         LDFLAGS="$LDFLAGS -Wl,-zmax-page-size=2097152"
-        if test "$cross_compiling" = yes
-then :
+        if test "$cross_compiling" = yes; then :
   ac_cv_max_page_size=no
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   ac_cv_max_page_size=yes
-else case e in #(
-  e) ac_cv_max_page_size=no ;;
-esac
+else
+  ac_cv_max_page_size=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
         LDFLAGS=$save_LDFLAGS
         if test "$ac_cv_max_page_size" = "yes"; then
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
             EXTRA_LDFLAGS_PROGRAM="$EXTRA_LDFLAGS_PROGRAM -Wl,-zmax-page-size=2097152"
         else
-            { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
         fi
     fi
     ;;
@@ -91203,17 +86148,16 @@
 
 
 # Check whether --enable- was given.
-if test ${enable_+y}
-then :
+if test "${enable_+set}" = set; then :
   enableval=$enable_;
 fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring PEAR${T_ME}" >&5
-printf "%s\n" "${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; }
 
 
 if test -z "$with_pear" && test "$enable_pear" = "no"; then
@@ -91227,19 +86171,17 @@
 
 php_with_pear=no
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to install PEAR" >&5
-printf %s "checking whether to install PEAR... " >&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+y}
-then :
+if test "${with_pear+set}" = set; then :
   withval=$with_pear; PHP_PEAR=$withval
-else case e in #(
-  e)
+else
+
   PHP_PEAR=no
   test "$PHP_ENABLE_ALL" && PHP_PEAR=$PHP_ENABLE_ALL
- ;;
-esac
+
 fi
 
 
@@ -91265,8 +86207,8 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
-printf "%s\n" "$ext_output" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ext_output" >&5
+$as_echo "$ext_output" >&6; }
 
 
 
@@ -91282,8 +86224,8 @@
     as_fn_error $? "$pear_error_msg" "$LINENO" 5
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: The --with-pear option is deprecated" >&5
-printf "%s\n" "$as_me: WARNING: The --with-pear option is deprecated" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The --with-pear option is deprecated" >&5
+$as_echo "$as_me: WARNING: The --with-pear option is deprecated" >&2;}
 
   install_pear="install-pear"
   PEAR_INSTALLDIR=$PHP_PEAR
@@ -91305,28 +86247,25 @@
 
 
 # Check whether --enable-fiber-asm was given.
-if test ${enable_fiber_asm+y}
-then :
+if test "${enable_fiber_asm+set}" = set; then :
   enableval=$enable_fiber_asm; fiber_asm=$enableval
-else case e in #(
-  e) fiber_asm='yes' ;;
-esac
+else
+  fiber_asm='yes'
 fi
 
 
 
 # Check whether --enable- was given.
-if test ${enable_+y}
-then :
+if test "${enable_+set}" = set; then :
   enableval=$enable_;
 fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring Zend${T_ME}" >&5
-printf "%s\n" "${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; }
 
 
 case $host_cpu in #(
@@ -91415,10 +86354,10 @@
 fi
 
 if test "$fiber_asm" = 'yes'; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fiber switching context" >&5
-printf %s "checking for fiber switching context... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fiber switching context" >&5
+$as_echo_n "checking for fiber switching context... " >&6; }
 
-printf "%s\n" "#define ZEND_FIBER_ASM 1" >>confdefs.h
+$as_echo "#define ZEND_FIBER_ASM 1" >>confdefs.h
 
 
 
@@ -91466,74 +86405,71 @@
   done
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $fiber_asm_file" >&5
-printf "%s\n" "$fiber_asm_file" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $fiber_asm_file" >&5
+$as_echo "$fiber_asm_file" >&6; }
 else
   if test "$fiber_os" = 'mac'; then
 
-printf "%s\n" "#define _XOPEN_SOURCE 1" >>confdefs.h
+$as_echo "#define _XOPEN_SOURCE 1" >>confdefs.h
 
   fi
-  ac_fn_c_check_header_compile "$LINENO" "ucontext.h" "ac_cv_header_ucontext_h" "$ac_includes_default"
-if test "x$ac_cv_header_ucontext_h" = xyes
-then :
+  ac_fn_c_check_header_mongrel "$LINENO" "ucontext.h" "ac_cv_header_ucontext_h" "$ac_includes_default"
+if test "x$ac_cv_header_ucontext_h" = xyes; then :
+
 
+$as_echo "#define ZEND_FIBER_UCONTEXT 1" >>confdefs.h
 
-printf "%s\n" "#define ZEND_FIBER_UCONTEXT 1" >>confdefs.h
 
+else
 
-else case e in #(
-  e)
        as_fn_error $? "fibers not available on this platform" "$LINENO" 5
-   ;;
-esac
+
 fi
 
+
 fi
 
 
 
 
-ac_fn_c_check_header_compile "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" "$ac_includes_default"
-if test "x$ac_cv_header_cpuid_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_CPUID_H 1" >>confdefs.h
+for ac_header in cpuid.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "cpuid.h" "ac_cv_header_cpuid_h" "$ac_includes_default"
+if test "x$ac_cv_header_cpuid_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_CPUID_H 1
+_ACEOF
 
 fi
 
+done
 
 
 
-ac_fn_c_check_func "$LINENO" "getpid" "ac_cv_func_getpid"
-if test "x$ac_cv_func_getpid" = xyes
-then :
-  printf "%s\n" "#define HAVE_GETPID 1" >>confdefs.h
-
-fi
-ac_fn_c_check_func "$LINENO" "kill" "ac_cv_func_kill"
-if test "x$ac_cv_func_kill" = xyes
-then :
-  printf "%s\n" "#define HAVE_KILL 1" >>confdefs.h
 
-fi
-ac_fn_c_check_func "$LINENO" "sigsetjmp" "ac_cv_func_sigsetjmp"
-if test "x$ac_cv_func_sigsetjmp" = xyes
-then :
-  printf "%s\n" "#define HAVE_SIGSETJMP 1" >>confdefs.h
+for ac_func in getpid kill sigsetjmp
+do :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
 
 fi
+done
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usable _FPU_SETCW" >&5
-printf %s "checking for usable _FPU_SETCW... " >&6; }
+  { $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>
 
 int
-main (void)
+main ()
 {
 
     fpu_control_t fpu_oldcw, fpu_cw;
@@ -91551,35 +86487,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cfp_have__fpu_setcw=yes
-else case e in #(
-  e) ac_cfp_have__fpu_setcw=no ;;
-esac
+else
+  ac_cfp_have__fpu_setcw=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   if test "$ac_cfp_have__fpu_setcw" = "yes" ; then
 
-printf "%s\n" "#define HAVE__FPU_SETCW 1" >>confdefs.h
+$as_echo "#define HAVE__FPU_SETCW 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usable fpsetprec" >&5
-printf %s "checking for usable fpsetprec... " >&6; }
+  { $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>
 
 int
-main (void)
+main ()
 {
 
     fp_prec_t fpu_oldprec;
@@ -91596,35 +86530,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cfp_have_fpsetprec=yes
-else case e in #(
-  e) ac_cfp_have_fpsetprec=no ;;
-esac
+else
+  ac_cfp_have_fpsetprec=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   if test "$ac_cfp_have_fpsetprec" = "yes" ; then
 
-printf "%s\n" "#define HAVE_FPSETPREC 1" >>confdefs.h
+$as_echo "#define HAVE_FPSETPREC 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usable _controlfp" >&5
-printf %s "checking for usable _controlfp... " >&6; }
+  { $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>
 
 int
-main (void)
+main ()
 {
 
     unsigned int fpu_oldcw;
@@ -91641,35 +86573,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cfp_have__controlfp=yes
-else case e in #(
-  e) ac_cfp_have__controlfp=no ;;
-esac
+else
+  ac_cfp_have__controlfp=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   if test "$ac_cfp_have__controlfp" = "yes" ; then
 
-printf "%s\n" "#define HAVE__CONTROLFP 1" >>confdefs.h
+$as_echo "#define HAVE__CONTROLFP 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for usable _controlfp_s" >&5
-printf %s "checking for usable _controlfp_s... " >&6; }
+  { $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>
 
 int
-main (void)
+main ()
 {
 
     unsigned int fpu_oldcw, fpu_cw;
@@ -91687,35 +86617,33 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cfp_have__controlfp_s=yes
-else case e in #(
-  e) ac_cfp_have__controlfp_s=no ;;
-esac
+else
+  ac_cfp_have__controlfp_s=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   if test "$ac_cfp_have__controlfp_s" = "yes" ; then
 
-printf "%s\n" "#define HAVE__CONTROLFP_S 1" >>confdefs.h
+$as_echo "#define HAVE__CONTROLFP_S 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether FPU control word can be manipulated by inline assembler" >&5
-printf %s "checking whether FPU control word can be manipulated by inline assembler... " >&6; }
+  { $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 */
 
 int
-main (void)
+main ()
 {
 
     unsigned int oldcw, cw;
@@ -91735,44 +86663,47 @@
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cfp_have_fpu_inline_asm_x86=yes
-else case e in #(
-  e) ac_cfp_have_fpu_inline_asm_x86=no ;;
-esac
+else
+  ac_cfp_have_fpu_inline_asm_x86=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
   if test "$ac_cfp_have_fpu_inline_asm_x86" = "yes" ; then
 
-printf "%s\n" "#define HAVE_FPU_INLINE_ASM_X86 1" >>confdefs.h
+$as_echo "#define HAVE_FPU_INLINE_ASM_X86 1" >>confdefs.h
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
   fi
 
 
-ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
-if test "x$ac_cv_header_dlfcn_h" = xyes
-then :
-  printf "%s\n" "#define HAVE_DLFCN_H 1" >>confdefs.h
+for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
 
 fi
 
+done
+
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether dlsym() requires a leading underscore in symbol names" >&5
-printf %s "checking whether dlsym() requires a leading underscore in symbol names... " >&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 91775 "configure"
+#line 86706 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -91835,32 +86766,32 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
     case x$lt_status in
       x$lt_dlno_uscore)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
  ;;
       x$lt_dlneed_uscore)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 
-printf "%s\n" "#define DLSYM_NEEDS_UNDERSCORE 1" >>confdefs.h
+$as_echo "#define DLSYM_NEEDS_UNDERSCORE 1" >>confdefs.h
 
  ;;
       x$lt_dlunknown|x*)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
  ;;
     esac
   else :
     # compilation failed
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 
   fi
 fi
@@ -91869,19 +86800,19 @@
 
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable thread-safety" >&5
-printf %s "checking whether to enable thread-safety... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZEND_ZTS" >&5
-printf "%s\n" "$ZEND_ZTS" >&6; }
-
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable Zend debugging" >&5
-printf %s "checking whether to enable Zend debugging... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZEND_DEBUG" >&5
-printf "%s\n" "$ZEND_DEBUG" >&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_ZTS" >&5
+$as_echo "$ZEND_ZTS" >&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; }
 
 if test "$ZEND_DEBUG" = "yes"; then
 
-printf "%s\n" "#define ZEND_DEBUG 1" >>confdefs.h
+$as_echo "#define ZEND_DEBUG 1" >>confdefs.h
 
   echo " $CFLAGS" | grep ' -g' >/dev/null || DEBUG_CFLAGS="-g"
   if test "$CFLAGS" = "-g -O2"; then
@@ -91889,296 +86820,254 @@
   fi
 else
 
-printf "%s\n" "#define ZEND_DEBUG 0" >>confdefs.h
+$as_echo "#define ZEND_DEBUG 0" >>confdefs.h
 
 fi
 
 test -n "$GCC" && CFLAGS="-Wall -Wextra -Wno-strict-aliasing -Wno-unused-parameter -Wno-sign-compare $CFLAGS"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-clobbered" >&5
-printf %s "checking whether C compiler accepts -Wno-clobbered... " >&6; }
-if test ${ax_cv_check_cflags__Werror__Wno_clobbered+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wno-clobbered" >&5
+$as_echo_n "checking whether C compiler accepts -Wno-clobbered... " >&6; }
+if ${ax_cv_check_cflags__Werror__Wno_clobbered+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wno-clobbered"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__Wno_clobbered=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__Wno_clobbered=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__Wno_clobbered=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_clobbered" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__Wno_clobbered" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wno_clobbered" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wno_clobbered" >&5
+$as_echo "$ax_cv_check_cflags__Werror__Wno_clobbered" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wno_clobbered" = xyes; then :
   CFLAGS="-Wno-clobbered $CFLAGS"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wimplicit-fallthrough=1" >&5
-printf %s "checking whether C compiler accepts -Wimplicit-fallthrough=1... " >&6; }
-if test ${ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wimplicit-fallthrough=1" >&5
+$as_echo_n "checking whether C compiler accepts -Wimplicit-fallthrough=1... " >&6; }
+if ${ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wimplicit-fallthrough=1"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" >&5
+$as_echo "$ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wimplicit_fallthrough_1" = xyes; then :
   CFLAGS="$CFLAGS -Wimplicit-fallthrough=1"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wduplicated-cond" >&5
-printf %s "checking whether C compiler accepts -Wduplicated-cond... " >&6; }
-if test ${ax_cv_check_cflags__Werror__Wduplicated_cond+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wduplicated-cond" >&5
+$as_echo_n "checking whether C compiler accepts -Wduplicated-cond... " >&6; }
+if ${ax_cv_check_cflags__Werror__Wduplicated_cond+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wduplicated-cond"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__Wduplicated_cond=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__Wduplicated_cond=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__Wduplicated_cond=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wduplicated_cond" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__Wduplicated_cond" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wduplicated_cond" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wduplicated_cond" >&5
+$as_echo "$ax_cv_check_cflags__Werror__Wduplicated_cond" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wduplicated_cond" = xyes; then :
   CFLAGS="-Wduplicated-cond $CFLAGS"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wlogical-op" >&5
-printf %s "checking whether C compiler accepts -Wlogical-op... " >&6; }
-if test ${ax_cv_check_cflags__Werror__Wlogical_op+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wlogical-op" >&5
+$as_echo_n "checking whether C compiler accepts -Wlogical-op... " >&6; }
+if ${ax_cv_check_cflags__Werror__Wlogical_op+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wlogical-op"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__Wlogical_op=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__Wlogical_op=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__Wlogical_op=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wlogical_op" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__Wlogical_op" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wlogical_op" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wlogical_op" >&5
+$as_echo "$ax_cv_check_cflags__Werror__Wlogical_op" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wlogical_op" = xyes; then :
   CFLAGS="-Wlogical-op $CFLAGS"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wformat-truncation" >&5
-printf %s "checking whether C compiler accepts -Wformat-truncation... " >&6; }
-if test ${ax_cv_check_cflags__Werror__Wformat_truncation+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wformat-truncation" >&5
+$as_echo_n "checking whether C compiler accepts -Wformat-truncation... " >&6; }
+if ${ax_cv_check_cflags__Werror__Wformat_truncation+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wformat-truncation"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__Wformat_truncation=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__Wformat_truncation=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__Wformat_truncation=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wformat_truncation" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__Wformat_truncation" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wformat_truncation" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wformat_truncation" >&5
+$as_echo "$ax_cv_check_cflags__Werror__Wformat_truncation" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wformat_truncation" = xyes; then :
   CFLAGS="-Wformat-truncation $CFLAGS"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wstrict-prototypes" >&5
-printf %s "checking whether C compiler accepts -Wstrict-prototypes... " >&6; }
-if test ${ax_cv_check_cflags__Werror__Wstrict_prototypes+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wstrict-prototypes" >&5
+$as_echo_n "checking whether C compiler accepts -Wstrict-prototypes... " >&6; }
+if ${ax_cv_check_cflags__Werror__Wstrict_prototypes+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -Wstrict-prototypes"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__Wstrict_prototypes=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__Wstrict_prototypes=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__Wstrict_prototypes=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wstrict_prototypes" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__Wstrict_prototypes" >&6; }
-if test "x$ax_cv_check_cflags__Werror__Wstrict_prototypes" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__Wstrict_prototypes" >&5
+$as_echo "$ax_cv_check_cflags__Werror__Wstrict_prototypes" >&6; }
+if test "x$ax_cv_check_cflags__Werror__Wstrict_prototypes" = xyes; then :
   CFLAGS="-Wstrict-prototypes $CFLAGS"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-common" >&5
-printf %s "checking whether C compiler accepts -fno-common... " >&6; }
-if test ${ax_cv_check_cflags__Werror__fno_common+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-common" >&5
+$as_echo_n "checking whether C compiler accepts -fno-common... " >&6; }
+if ${ax_cv_check_cflags__Werror__fno_common+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS -Werror -fno-common"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags__Werror__fno_common=yes
-else case e in #(
-  e) ax_cv_check_cflags__Werror__fno_common=no ;;
-esac
+else
+  ax_cv_check_cflags__Werror__fno_common=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__fno_common" >&5
-printf "%s\n" "$ax_cv_check_cflags__Werror__fno_common" >&6; }
-if test "x$ax_cv_check_cflags__Werror__fno_common" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags__Werror__fno_common" >&5
+$as_echo "$ax_cv_check_cflags__Werror__fno_common" >&6; }
+if test "x$ax_cv_check_cflags__Werror__fno_common" = xyes; then :
   CFLAGS="-fno-common $CFLAGS"
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
 
@@ -92186,40 +87075,37 @@
 
 if test "$ZEND_ZTS" = "yes"; then
 
-printf "%s\n" "#define ZTS 1" >>confdefs.h
+$as_echo "#define ZTS 1" >>confdefs.h
 
   CFLAGS="$CFLAGS -DZTS"
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-printf %s "checking for inline... " >&6; }
-if test ${ac_cv_c_inline+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_cv_c_inline=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
+if ${ac_cv_c_inline+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #ifndef __cplusplus
 typedef int foo_t;
-static $ac_kw foo_t static_foo (void) {return 0; }
-$ac_kw foo_t foo (void) {return 0; }
+static $ac_kw foo_t static_foo () {return 0; }
+$ac_kw foo_t foo () {return 0; }
 #endif
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ac_cv_c_inline=$ac_kw
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   test "$ac_cv_c_inline" != no && break
 done
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-printf "%s\n" "$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) ;;
@@ -92237,37 +87123,36 @@
 esac
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking target system is Darwin" >&5
-printf %s "checking target system is Darwin... " >&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
 
-printf "%s\n" "#define DARWIN 1" >>confdefs.h
+$as_echo "#define DARWIN 1" >>confdefs.h
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MM alignment and log values" >&5
-printf %s "checking for MM alignment and log values... " >&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 :
 
 
-printf "%s\n" "#define ZEND_MM_ALIGNMENT 8" >>confdefs.h
+$as_echo "#define ZEND_MM_ALIGNMENT 8" >>confdefs.h
 
 
-printf "%s\n" "#define ZEND_MM_ALIGNMENT_LOG2 3" >>confdefs.h
+$as_echo "#define ZEND_MM_ALIGNMENT_LOG2 3" >>confdefs.h
 
 
-printf "%s\n" "#define ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT 0" >>confdefs.h
+$as_echo "#define ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT 0" >>confdefs.h
 
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 #include <stdio.h>
@@ -92304,85 +87189,88 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-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`
   LIBZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT=`cat conftest.zend | cut -d ' ' -f 3`
 
-printf "%s\n" "#define ZEND_MM_ALIGNMENT $LIBZEND_MM_ALIGN" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define ZEND_MM_ALIGNMENT $LIBZEND_MM_ALIGN
+_ACEOF
 
 
-printf "%s\n" "#define ZEND_MM_ALIGNMENT_LOG2 $LIBZEND_MM_ALIGN_LOG2" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define ZEND_MM_ALIGNMENT_LOG2 $LIBZEND_MM_ALIGN_LOG2
+_ACEOF
 
 
-printf "%s\n" "#define ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT $LIBZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define ZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT $LIBZEND_MM_NEED_EIGHT_BYTE_REALIGNMENT
+_ACEOF
 
 
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: done" >&5
-printf "%s\n" "done" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
 
-ac_fn_c_check_func "$LINENO" "mremap" "ac_cv_func_mremap"
-if test "x$ac_cv_func_mremap" = xyes
-then :
-  printf "%s\n" "#define HAVE_MREMAP 1" >>confdefs.h
+for ac_func in mremap
+do :
+  ac_fn_c_check_func "$LINENO" "mremap" "ac_cv_func_mremap"
+if test "x$ac_cv_func_mremap" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_MREMAP 1
+_ACEOF
 
 fi
+done
 
 
 # Check whether --enable-zend-signals was given.
-if test ${enable_zend_signals+y}
-then :
+if test "${enable_zend_signals+set}" = set; then :
   enableval=$enable_zend_signals; ZEND_SIGNALS=$enableval
-else case e in #(
-  e) ZEND_SIGNALS=yes ;;
-esac
+else
+  ZEND_SIGNALS=yes
 fi
 
 
-
-  for ac_func in sigaction
+for ac_func in sigaction
 do :
   ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction"
-if test "x$ac_cv_func_sigaction" = xyes
-then :
-  printf "%s\n" "#define HAVE_SIGACTION 1" >>confdefs.h
+if test "x$ac_cv_func_sigaction" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SIGACTION 1
+_ACEOF
+
+else
 
-else case e in #(
-  e)
   ZEND_SIGNALS=no
- ;;
-esac
-fi
 
+fi
 done
+
 if test "$ZEND_SIGNALS" = "yes"; then
 
-printf "%s\n" "#define ZEND_SIGNALS 1" >>confdefs.h
+$as_echo "#define ZEND_SIGNALS 1" >>confdefs.h
 
 	CFLAGS="$CFLAGS -DZEND_SIGNALS"
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable zend signal handling" >&5
-printf %s "checking whether to enable zend signal handling... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZEND_SIGNALS" >&5
-printf "%s\n" "$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; }
 
 # Check whether --enable-zend-max-execution-timers was given.
-if test ${enable_zend_max_execution_timers+y}
-then :
+if test "${enable_zend_max_execution_timers+set}" = set; then :
   enableval=$enable_zend_max_execution_timers; ZEND_MAX_EXECUTION_TIMERS=$enableval
-else case e in #(
-  e) ZEND_MAX_EXECUTION_TIMERS='no' ;;
-esac
+else
+  ZEND_MAX_EXECUTION_TIMERS='no'
 fi
 
 
@@ -92399,27 +87287,23 @@
   unset found
 
   ac_fn_c_check_func "$LINENO" "timer_create" "ac_cv_func_timer_create"
-if test "x$ac_cv_func_timer_create" = xyes
-then :
+if test "x$ac_cv_func_timer_create" = xyes; then :
   found=yes
-else case e in #(
-  e)  ac_fn_c_check_func "$LINENO" "__timer_create" "ac_cv_func___timer_create"
-if test "x$ac_cv_func___timer_create" = xyes
-then :
+else
+   ac_fn_c_check_func "$LINENO" "__timer_create" "ac_cv_func___timer_create"
+if test "x$ac_cv_func___timer_create" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
-  ;;
-esac
+
 fi
 
 
   case $found in
   yes)
 
-printf "%s\n" "#define HAVE_TIMER_CREATE 1" >>confdefs.h
+$as_echo "#define HAVE_TIMER_CREATE 1" >>confdefs.h
 
     ac_cv_func_timer_create=yes
   ;;
@@ -92429,140 +87313,118 @@
   unset ac_cv_lib_rt_timer_create
   unset ac_cv_lib_rt___timer_create
   unset found
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for timer_create in -lrt" >&5
-printf %s "checking for timer_create in -lrt... " >&6; }
-if test ${ac_cv_lib_rt_timer_create+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timer_create in -lrt" >&5
+$as_echo_n "checking for timer_create in -lrt... " >&6; }
+if ${ac_cv_lib_rt_timer_create+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char timer_create (void);
+char timer_create ();
 int
-main (void)
+main ()
 {
 return timer_create ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_rt_timer_create=yes
-else case e in #(
-  e) ac_cv_lib_rt_timer_create=no ;;
-esac
+else
+  ac_cv_lib_rt_timer_create=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_timer_create" >&5
-printf "%s\n" "$ac_cv_lib_rt_timer_create" >&6; }
-if test "x$ac_cv_lib_rt_timer_create" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_timer_create" >&5
+$as_echo "$ac_cv_lib_rt_timer_create" >&6; }
+if test "x$ac_cv_lib_rt_timer_create" = xyes; then :
   found=yes
-else case e in #(
-  e)
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for __timer_create in -lrt" >&5
-printf %s "checking for __timer_create in -lrt... " >&6; }
-if test ${ac_cv_lib_rt___timer_create+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __timer_create in -lrt" >&5
+$as_echo_n "checking for __timer_create in -lrt... " >&6; }
+if ${ac_cv_lib_rt___timer_create+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char __timer_create (void);
+char __timer_create ();
 int
-main (void)
+main ()
 {
 return __timer_create ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_rt___timer_create=yes
-else case e in #(
-  e) ac_cv_lib_rt___timer_create=no ;;
-esac
+else
+  ac_cv_lib_rt___timer_create=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt___timer_create" >&5
-printf "%s\n" "$ac_cv_lib_rt___timer_create" >&6; }
-if test "x$ac_cv_lib_rt___timer_create" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt___timer_create" >&5
+$as_echo "$ac_cv_lib_rt___timer_create" >&6; }
+if test "x$ac_cv_lib_rt___timer_create" = xyes; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 
-   ;;
-esac
+
 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=yes
 
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   found=yes
-else case e in #(
-  e) found=no ;;
-esac
+else
+  found=no
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 
     LIBS=$ac_libs
@@ -92580,10 +87442,10 @@
 
 
 
-printf "%s\n" "#define HAVE_TIMER_CREATE 1" >>confdefs.h
+$as_echo "#define HAVE_TIMER_CREATE 1" >>confdefs.h
 
 
-printf "%s\n" "#define HAVE_LIBRT 1" >>confdefs.h
+$as_echo "#define HAVE_LIBRT 1" >>confdefs.h
 
     ac_cv_func_timer_create=yes
   else
@@ -92602,15 +87464,15 @@
 
 if test "$ZEND_MAX_EXECUTION_TIMERS" = "yes"; then
 
-printf "%s\n" "#define ZEND_MAX_EXECUTION_TIMERS 1" >>confdefs.h
+$as_echo "#define ZEND_MAX_EXECUTION_TIMERS 1" >>confdefs.h
 
   CFLAGS="$CFLAGS -DZEND_MAX_EXECUTION_TIMERS"
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable zend max execution timers" >&5
-printf %s "checking whether to enable zend max execution timers... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ZEND_MAX_EXECUTION_TIMERS" >&5
-printf "%s\n" "$ZEND_MAX_EXECUTION_TIMERS" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable zend max execution timers" >&5
+$as_echo_n "checking whether to enable zend max execution timers... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZEND_MAX_EXECUTION_TIMERS" >&5
+$as_echo "$ZEND_MAX_EXECUTION_TIMERS" >&6; }
 
 
 
@@ -92627,28 +87489,26 @@
 
 
 # Check whether --enable- was given.
-if test ${enable_+y}
-then :
+if test "${enable_+set}" = set; then :
   enableval=$enable_;
 fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring TSRM${T_ME}" >&5
-printf "%s\n" "${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; }
 
 if test "$PHP_THREAD_SAFETY" = "yes"; then
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5
-printf %s "checking for pthreads_cflags... " >&6; }
-if test ${ac_cv_pthreads_cflags+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_cflags" >&5
+$as_echo_n "checking for pthreads_cflags... " >&6; }
+if ${ac_cv_pthreads_cflags+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
 ac_cv_pthreads_cflags=
 if test "$pthreads_working" != "yes"; then
   for flag in -kthread -pthread -pthreads -mthreads -Kthread -threads -mt -qthreaded; do
@@ -92673,19 +87533,17 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
   pthreads_checked=yes
 
-else case e in #(
-  e)
+else
+
   pthreads_checked=no
 
- ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     CFLAGS=$ac_save
     if test "$pthreads_checked" = "yes"; then
@@ -92694,19 +87552,17 @@
     fi
   done
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_cflags" >&5
-printf "%s\n" "$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; }
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5
+$as_echo_n "checking for pthreads_lib... " >&6; }
+if ${ac_cv_pthreads_lib+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthreads_lib" >&5
-printf %s "checking for pthreads_lib... " >&6; }
-if test ${ac_cv_pthreads_lib+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
 ac_cv_pthreads_lib=
 if test "$pthreads_working" != "yes"; then
  for lib in pthread pthreads c_r; do
@@ -92731,19 +87587,17 @@
     return pthread_create(&thd, NULL, thread_routine, &data);
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
 
   pthreads_checked=yes
 
-else case e in #(
-  e)
+else
+
   pthreads_checked=no
 
- ;;
-esac
+
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     LIBS=$ac_save
     if test "$pthreads_checked" = "yes"; then
@@ -92752,11 +87606,10 @@
     fi
   done
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pthreads_lib" >&5
-printf "%s\n" "$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 "x$ac_cv_pthreads_cflags" != "x" -o "x$ac_cv_pthreads_lib" != "x"; then
   pthreads_working="yes"
@@ -92768,13 +87621,13 @@
 fi
 
 
-printf "%s\n" "#define PTHREADS 1" >>confdefs.h
+$as_echo "#define PTHREADS 1" >>confdefs.h
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for POSIX threads" >&5
-printf %s "checking for POSIX threads... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "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
 
@@ -92789,9 +87642,9 @@
 test "$program_suffix" != NONE &&
   program_transform_name="s&\$&$program_suffix&;$program_transform_name"
 # Double any \ or $.
-# By default was 's,x,x', remove it if useless.
+# By default was `s,x,x', remove it if useless.
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-program_transform_name=`printf "%s\n" "$program_transform_name" | sed "$ac_script"`
+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
 
 test "$prefix" = "NONE" && prefix=/usr/local
@@ -92932,29 +87785,41 @@
 UNAME=`uname -a | xargs`
 PHP_UNAME=${PHP_UNAME:-$UNAME}
 
-printf "%s\n" "#define PHP_UNAME \"$PHP_UNAME\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_UNAME "$PHP_UNAME"
+_ACEOF
 
 PHP_OS=`uname | xargs`
 
-printf "%s\n" "#define PHP_OS \"$PHP_OS\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_OS "$PHP_OS"
+_ACEOF
 
 PHP_BUILD_SYSTEM=${PHP_BUILD_SYSTEM:-$PHP_UNAME}
 
-printf "%s\n" "#define PHP_BUILD_SYSTEM \"$PHP_BUILD_SYSTEM\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_BUILD_SYSTEM "$PHP_BUILD_SYSTEM"
+_ACEOF
 
 if test -n "${PHP_BUILD_PROVIDER}"; then
 
-printf "%s\n" "#define PHP_BUILD_PROVIDER \"$PHP_BUILD_PROVIDER\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_BUILD_PROVIDER "$PHP_BUILD_PROVIDER"
+_ACEOF
 
 fi
 if test -n "${PHP_BUILD_COMPILER}"; then
 
-printf "%s\n" "#define PHP_BUILD_COMPILER \"$PHP_BUILD_COMPILER\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_BUILD_COMPILER "$PHP_BUILD_COMPILER"
+_ACEOF
 
 fi
 if test -n "${PHP_BUILD_ARCH}"; then
 
-printf "%s\n" "#define PHP_BUILD_ARCH \"$PHP_BUILD_ARCH\"" >>confdefs.h
+cat >>confdefs.h <<_ACEOF
+#define PHP_BUILD_ARCH "$PHP_BUILD_ARCH"
+_ACEOF
 
 fi
 
@@ -93235,197 +88100,172 @@
 fi
 
 if test "$PHP_MEMORY_SANITIZER" = "yes"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=memory -fsanitize-memory-track-origins" >&5
-printf %s "checking whether C compiler accepts -fsanitize=memory -fsanitize-memory-track-origins... " >&6; }
-if test ${ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=memory -fsanitize-memory-track-origins" >&5
+$as_echo_n "checking whether C compiler accepts -fsanitize=memory -fsanitize-memory-track-origins... " >&6; }
+if ${ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS  -fsanitize=memory -fsanitize-memory-track-origins"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins=yes
-else case e in #(
-  e) ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins=no ;;
-esac
+else
+  ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" >&5
-printf "%s\n" "$ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" >&6; }
-if test "x$ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" >&5
+$as_echo "$ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" >&6; }
+if test "x$ax_cv_check_cflags___fsanitize_memory__fsanitize_memory_track_origins" = xyes; then :
 
     CFLAGS="$CFLAGS -fsanitize=memory -fsanitize-memory-track-origins"
     CXXFLAGS="$CXXFLAGS -fsanitize=memory -fsanitize-memory-track-origins"
 
-else case e in #(
-  e) as_fn_error $? "MemorySanitizer is not available" "$LINENO" 5 ;;
-esac
+else
+  as_fn_error $? "MemorySanitizer is not available" "$LINENO" 5
 fi
 
 fi
 
 if test "$PHP_ADDRESS_SANITIZER" = "yes"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=address" >&5
-printf %s "checking whether C compiler accepts -fsanitize=address... " >&6; }
-if test ${ax_cv_check_cflags___fsanitize_address+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=address" >&5
+$as_echo_n "checking whether C compiler accepts -fsanitize=address... " >&6; }
+if ${ax_cv_check_cflags___fsanitize_address+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS  -fsanitize=address"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags___fsanitize_address=yes
-else case e in #(
-  e) ax_cv_check_cflags___fsanitize_address=no ;;
-esac
+else
+  ax_cv_check_cflags___fsanitize_address=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_address" >&5
-printf "%s\n" "$ax_cv_check_cflags___fsanitize_address" >&6; }
-if test "x$ax_cv_check_cflags___fsanitize_address" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_address" >&5
+$as_echo "$ax_cv_check_cflags___fsanitize_address" >&6; }
+if test "x$ax_cv_check_cflags___fsanitize_address" = xyes; then :
 
     CFLAGS="$CFLAGS -fsanitize=address -DZEND_TRACK_ARENA_ALLOC"
     CXXFLAGS="$CXXFLAGS -fsanitize=address -DZEND_TRACK_ARENA_ALLOC"
 
-else case e in #(
-  e) as_fn_error $? "AddressSanitizer is not available" "$LINENO" 5 ;;
-esac
+else
+  as_fn_error $? "AddressSanitizer is not available" "$LINENO" 5
 fi
 
 fi
 
 if test "$PHP_UNDEFINED_SANITIZER" = "yes"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=undefined" >&5
-printf %s "checking whether C compiler accepts -fsanitize=undefined... " >&6; }
-if test ${ax_cv_check_cflags___fsanitize_undefined+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fsanitize=undefined" >&5
+$as_echo_n "checking whether C compiler accepts -fsanitize=undefined... " >&6; }
+if ${ax_cv_check_cflags___fsanitize_undefined+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS  -fsanitize=undefined"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags___fsanitize_undefined=yes
-else case e in #(
-  e) ax_cv_check_cflags___fsanitize_undefined=no ;;
-esac
+else
+  ax_cv_check_cflags___fsanitize_undefined=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_undefined" >&5
-printf "%s\n" "$ax_cv_check_cflags___fsanitize_undefined" >&6; }
-if test "x$ax_cv_check_cflags___fsanitize_undefined" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fsanitize_undefined" >&5
+$as_echo "$ax_cv_check_cflags___fsanitize_undefined" >&6; }
+if test "x$ax_cv_check_cflags___fsanitize_undefined" = xyes; then :
 
     CFLAGS="$CFLAGS -fsanitize=undefined -fno-sanitize-recover=undefined"
     CXXFLAGS="$CXXFLAGS -fsanitize=undefined -fno-sanitize-recover=undefined"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-sanitize=object-size" >&5
-printf %s "checking whether C compiler accepts -fno-sanitize=object-size... " >&6; }
-if test ${ax_cv_check_cflags___fno_sanitize_object_size+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fno-sanitize=object-size" >&5
+$as_echo_n "checking whether C compiler accepts -fno-sanitize=object-size... " >&6; }
+if ${ax_cv_check_cflags___fno_sanitize_object_size+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
   ax_check_save_flags=$CFLAGS
   CFLAGS="$CFLAGS  -fno-sanitize=object-size"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
+if ac_fn_c_try_compile "$LINENO"; then :
   ax_cv_check_cflags___fno_sanitize_object_size=yes
-else case e in #(
-  e) ax_cv_check_cflags___fno_sanitize_object_size=no ;;
-esac
+else
+  ax_cv_check_cflags___fno_sanitize_object_size=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags ;;
-esac
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fno_sanitize_object_size" >&5
-printf "%s\n" "$ax_cv_check_cflags___fno_sanitize_object_size" >&6; }
-if test "x$ax_cv_check_cflags___fno_sanitize_object_size" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fno_sanitize_object_size" >&5
+$as_echo "$ax_cv_check_cflags___fno_sanitize_object_size" >&6; }
+if test "x$ax_cv_check_cflags___fno_sanitize_object_size" = xyes; then :
 
                   CFLAGS="$CFLAGS -fno-sanitize=object-size"
       CXXFLAGS="$CFLAGS -fno-sanitize=object-size"
 
-else case e in #(
-  e) : ;;
-esac
+else
+  :
 fi
 
 
             OLD_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -fno-sanitize-recover=undefined"
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to add -fno-sanitize=function" >&5
-printf %s "checking whether to add -fno-sanitize=function... " >&6; }
-if test ${php_cv_ubsan_no_function+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
-    if test "$cross_compiling" = yes
-then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to add -fno-sanitize=function" >&5
+$as_echo_n "checking whether to add -fno-sanitize=function... " >&6; }
+if ${php_cv_ubsan_no_function+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    if test "$cross_compiling" = yes; then :
   php_cv_ubsan_no_function=no
-else case e in #(
-  e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 void foo(char *string) {}
@@ -93435,31 +88275,26 @@
 }
 
 _ACEOF
-if ac_fn_c_try_run "$LINENO"
-then :
+if ac_fn_c_try_run "$LINENO"; then :
   php_cv_ubsan_no_function=no
-else case e in #(
-  e) php_cv_ubsan_no_function=yes ;;
-esac
+else
+  php_cv_ubsan_no_function=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
-esac
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $php_cv_ubsan_no_function" >&5
-printf "%s\n" "$php_cv_ubsan_no_function" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $php_cv_ubsan_no_function" >&5
+$as_echo "$php_cv_ubsan_no_function" >&6; }
     CFLAGS="$OLD_CFLAGS"
     if test "$php_cv_ubsan_no_function" = yes; then
       CFLAGS="$CFLAGS -fno-sanitize=function"
       CXXFLAGS="$CFLAGS -fno-sanitize=function"
     fi
 
-else case e in #(
-  e) as_fn_error $? "UndefinedBehaviorSanitizer is not available" "$LINENO" 5 ;;
-esac
+else
+  as_fn_error $? "UndefinedBehaviorSanitizer is not available" "$LINENO" 5
 fi
 
 fi
@@ -93474,17 +88309,16 @@
 
 
 # Check whether --enable- was given.
-if test ${enable_+y}
-then :
+if test "${enable_+set}" = set; then :
   enableval=$enable_;
 fi
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Configuring libtool${T_ME}" >&5
-printf "%s\n" "${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; }
 
 
 AR_FLAGS=cr
@@ -93492,8 +88326,7 @@
 
 
 # Check whether --enable-shared was given.
-if test ${enable_shared+y}
-then :
+if test "${enable_shared+set}" = set; then :
   enableval=$enable_shared;     p=${PACKAGE-default}
     case $enableval in
     yes) enable_shared=yes ;;
@@ -93511,15 +88344,13 @@
       IFS="$lt_save_ifs"
       ;;
     esac
-else case e in #(
-  e) enable_shared=yes ;;
-esac
+else
+  enable_shared=yes
 fi
 
 
 # Check whether --enable-static was given.
-if test ${enable_static+y}
-then :
+if test "${enable_static+set}" = set; then :
   enableval=$enable_static;     p=${PACKAGE-default}
     case $enableval in
     yes) enable_static=yes ;;
@@ -93537,15 +88368,13 @@
       IFS="$lt_save_ifs"
       ;;
     esac
-else case e in #(
-  e) enable_static=yes ;;
-esac
+else
+  enable_static=yes
 fi
 
 
 # Check whether --enable-fast-install was given.
-if test ${enable_fast_install+y}
-then :
+if test "${enable_fast_install+set}" = set; then :
   enableval=$enable_fast_install;     p=${PACKAGE-default}
     case $enableval in
     yes) enable_fast_install=yes ;;
@@ -93563,19 +88392,17 @@
       IFS="$lt_save_ifs"
       ;;
     esac
-else case e in #(
-  e) enable_fast_install=yes ;;
-esac
+else
+  enable_fast_install=yes
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
-printf %s "checking for a sed that does not truncate output... " >&6; }
-if test ${lt_cv_path_SED+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) # Loop through the user's path and test for sed and gsed.
+{ $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 ${lt_cv_path_SED+:} false; 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.
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -93620,29 +88447,26 @@
     fi
   done
 done
- ;;
-esac
+
 fi
 
 SED=$lt_cv_path_SED
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
-printf "%s\n" "$SED" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5
+$as_echo "$SED" >&6; }
 
 
 # Check whether --with-gnu-ld was given.
-if test ${with_gnu_ld+y}
-then :
+if test "${with_gnu_ld+set}" = set; then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else case e in #(
-  e) with_gnu_ld=no ;;
-esac
+else
+  with_gnu_ld=no
 fi
 
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-printf %s "checking for ld used by $CC... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -93671,17 +88495,16 @@
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-printf %s "checking for GNU ld... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-printf %s "checking for non-GNU ld... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test ${lt_cv_path_LD+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -z "$LD"; then
+if ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
     IFS="$lt_save_ifs"
@@ -93704,26 +88527,24 @@
   IFS="$lt_save_ifs"
 else
   lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi ;;
-esac
+fi
 fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
-if test ${lt_cv_prog_gnu_ld+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) # I'd rather use --version here, but apparently some GNU lds only accept -v.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -93731,25 +88552,22 @@
 *)
   lt_cv_prog_gnu_ld=no
   ;;
-esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
-printf %s "checking for $LD option to reload object files... " >&6; }
-if test ${lt_cv_ld_reload_flag+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_ld_reload_flag='-r' ;;
-esac
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+$as_echo_n "checking for $LD option to reload object files... " >&6; }
+if ${lt_cv_ld_reload_flag+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_reload_flag='-r'
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
-printf "%s\n" "$lt_cv_ld_reload_flag" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+$as_echo "$lt_cv_ld_reload_flag" >&6; }
 reload_flag=$lt_cv_ld_reload_flag
 case $reload_flag in
 "" | " "*) ;;
@@ -93766,13 +88584,12 @@
     ;;
 esac
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for BSD-compatible nm" >&5
-printf %s "checking for BSD-compatible nm... " >&6; }
-if test ${lt_cv_path_NM+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$NM"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD-compatible nm" >&5
+$as_echo_n "checking for BSD-compatible nm... " >&6; }
+if ${lt_cv_path_NM+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NM"; then
   # Let the user override the test.
   lt_cv_path_NM="$NM"
 else
@@ -93814,20 +88631,18 @@
     IFS="$lt_save_ifs"
   done
   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi ;;
-esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
-printf "%s\n" "$lt_cv_path_NM" >&6; }
+fi
+{ $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"
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
-printf %s "checking how to recognize dependent libraries... " >&6; }
-if test ${lt_cv_deplibs_check_method+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_file_magic_cmd='$MAGIC_CMD'
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+$as_echo_n "checking how to recognize dependent libraries... " >&6; }
+if ${lt_cv_deplibs_check_method+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_file_magic_cmd='$MAGIC_CMD'
 lt_cv_file_magic_test_file=
 lt_cv_deplibs_check_method='unknown'
 # Need to set the preceding variable on all platforms that support
@@ -94006,11 +88821,10 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 esac
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
-printf "%s\n" "$lt_cv_deplibs_check_method" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+$as_echo "$lt_cv_deplibs_check_method" >&6; }
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -94040,7 +88854,7 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *ELF-32*)
@@ -94055,11 +88869,11 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 94058 "configure"' > conftest.$ac_ext
+  echo '#line 88872 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
    if test "$lt_cv_prog_gnu_ld" = yes; then
     case `/usr/bin/file conftest.$ac_objext` in
@@ -94097,7 +88911,7 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `/usr/bin/file conftest.o` in
     *32-bit*)
@@ -94153,13 +88967,12 @@
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
-printf %s "checking whether the C compiler needs -belf... " >&6; }
-if test ${lt_cv_cc_needs_belf+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_ext=c
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+if ${lt_cv_cc_needs_belf+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -94169,32 +88982,29 @@
 /* end confdefs.h.  */
 
 int
-main (void)
+main ()
 {
 
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   lt_cv_cc_needs_belf=yes
-else case e in #(
-  e) lt_cv_cc_needs_belf=no ;;
-esac
+else
+  lt_cv_cc_needs_belf=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
     ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 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
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
-printf "%s\n" "$lt_cv_cc_needs_belf" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+$as_echo "$lt_cv_cc_needs_belf" >&6; }
   if test 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"
@@ -94206,7 +89016,7 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
@@ -94240,35 +89050,38 @@
 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
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-printf %s "checking how to run the C++ preprocessor... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
-  if test ${ac_cv_prog_CXXCPP+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)     # Double quotes because $CXX needs to be expanded
-    for CXXCPP in "$CXX -E" cpp /lib/cpp
+  if ${ac_cv_prog_CXXCPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
     do
       ac_preproc_ok=false
 for ac_cxx_preproc_warn_flag in '' yes
 do
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <limits.h>
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
-else case e in #(
-  e) # Broken: fails on valid input.
-continue ;;
-esac
+else
+  # Broken: fails on valid input.
+continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -94278,56 +89091,56 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
-else case e in #(
-  e) # Passes both tests.
+else
+  # Passes both tests.
 ac_preproc_ok=:
-break ;;
-esac
+break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
+if $ac_preproc_ok; then :
   break
 fi
 
     done
     ac_cv_prog_CXXCPP=$CXXCPP
-   ;;
-esac
+
 fi
   CXXCPP=$ac_cv_prog_CXXCPP
 else
   ac_cv_prog_CXXCPP=$CXXCPP
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-printf "%s\n" "$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
   # Use a header file that comes with gcc, so configuring glibc
   # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-#include <limits.h>
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
 		     Syntax error
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
 
-else case e in #(
-  e) # Broken: fails on valid input.
-continue ;;
-esac
+else
+  # Broken: fails on valid input.
+continue
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -94337,30 +89150,26 @@
 /* end confdefs.h.  */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"
-then :
+if ac_fn_cxx_try_cpp "$LINENO"; then :
   # Broken: success on invalid input.
 continue
-else case e in #(
-  e) # Passes both tests.
+else
+  # Passes both tests.
 ac_preproc_ok=:
-break ;;
-esac
+break
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of 'break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok
-then :
+if $ac_preproc_ok; then :
 
-else case e in #(
-  e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
-printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See 'config.log' for more details" "$LINENO" 5; } ;;
-esac
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=cpp
@@ -94374,13 +89183,12 @@
 
 # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
 # find the maximum length of command line arguments
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
-printf %s "checking the maximum length of command line arguments... " >&6; }
-if test ${lt_cv_sys_max_cmd_len+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)   i=0
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+$as_echo_n "checking the maximum length of command line arguments... " >&6; }
+if ${lt_cv_sys_max_cmd_len+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+    i=0
   teststring="ABCD"
 
   case $build_os in
@@ -94483,16 +89291,15 @@
     fi
     ;;
   esac
- ;;
-esac
+
 fi
 
 if test -n $lt_cv_sys_max_cmd_len ; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
-printf "%s\n" "$lt_cv_sys_max_cmd_len" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
-printf "%s\n" "none" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+$as_echo "none" >&6; }
 fi
 
 
@@ -94500,13 +89307,12 @@
 
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
-printf %s "checking command to parse $NM output from $compiler object... " >&6; }
-if test ${lt_cv_sys_global_symbol_pipe+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
 # These are sane defaults that work on at least a few old systems.
 # [They come from Ultrix.  What could be older than Ultrix?!! ;)]
 
@@ -94609,14 +89415,14 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
@@ -94671,7 +89477,7 @@
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
@@ -94699,28 +89505,26 @@
     lt_cv_sys_global_symbol_pipe=
   fi
 done
- ;;
-esac
+
 fi
 
 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
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5
-printf "%s\n" "failed" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+$as_echo "failed" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ok" >&5
-printf "%s\n" "ok" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+$as_echo "ok" >&6; }
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
-printf %s "checking for objdir... " >&6; }
-if test ${lt_cv_objdir+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) rm -f .libs 2>/dev/null
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+$as_echo_n "checking for objdir... " >&6; }
+if ${lt_cv_objdir+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
 if test -d .libs; then
   lt_cv_objdir=.libs
@@ -94728,11 +89532,10 @@
   # MS-DOS does not allow filenames that begin with a dot.
   lt_cv_objdir=_libs
 fi
-rmdir .libs 2>/dev/null ;;
-esac
+rmdir .libs 2>/dev/null
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
-printf "%s\n" "$lt_cv_objdir" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+$as_echo "$lt_cv_objdir" >&6; }
 objdir=$lt_cv_objdir
 
 
@@ -94783,44 +89586,38 @@
 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
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_AR+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$AR"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$AR"; then
   ac_cv_prog_AR="$AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AR="${ac_tool_prefix}ar"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 AR=$ac_cv_prog_AR
 if test -n "$AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-printf "%s\n" "$AR" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -94829,44 +89626,38 @@
   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
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_AR+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_AR"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_AR="ar"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 ac_ct_AR=$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-printf "%s\n" "$ac_ct_AR" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_AR" = x; then
@@ -94874,8 +89665,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     AR=$ac_ct_AR
@@ -94887,44 +89678,38 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_RANLIB+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$RANLIB"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-printf "%s\n" "$RANLIB" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -94933,44 +89718,38 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_RANLIB+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_RANLIB"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
-printf "%s\n" "$ac_ct_RANLIB" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_RANLIB" = x; then
@@ -94978,8 +89757,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     RANLIB=$ac_ct_RANLIB
@@ -94991,44 +89770,38 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_STRIP+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$STRIP"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
   ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-printf "%s\n" "$STRIP" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -95037,44 +89810,38 @@
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_STRIP+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_STRIP"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
   ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-printf "%s\n" "$ac_ct_STRIP" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_STRIP" = x; then
@@ -95082,8 +89849,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     STRIP=$ac_ct_STRIP
@@ -95146,13 +89913,12 @@
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
-printf %s "checking for ${ac_tool_prefix}file... " >&6; }
-if test ${lt_cv_path_MAGIC_CMD+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) case $MAGIC_CMD in
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
   lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
   ;;
@@ -95195,28 +89961,26 @@
   IFS="$lt_save_ifs"
   MAGIC_CMD="$lt_save_MAGIC_CMD"
   ;;
-esac ;;
 esac
 fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for file" >&5
-printf %s "checking for file... " >&6; }
-if test ${lt_cv_path_MAGIC_CMD+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) case $MAGIC_CMD in
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+$as_echo_n "checking for file... " >&6; }
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $MAGIC_CMD in
 [\\/*] |  ?:[\\/]*)
   lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
   ;;
@@ -95259,17 +90023,16 @@
   IFS="$lt_save_ifs"
   MAGIC_CMD="$lt_save_MAGIC_CMD"
   ;;
-esac ;;
 esac
 fi
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
-printf "%s\n" "$MAGIC_CMD" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+$as_echo "$MAGIC_CMD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   else
@@ -95287,44 +90050,38 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_DSYMUTIL+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$DSYMUTIL"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$DSYMUTIL"; then
   ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 DSYMUTIL=$ac_cv_prog_DSYMUTIL
 if test -n "$DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
-printf "%s\n" "$DSYMUTIL" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+$as_echo "$DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -95333,44 +90090,38 @@
   ac_ct_DSYMUTIL=$DSYMUTIL
   # Extract the first word of "dsymutil", so it can be a program name with args.
 set dummy dsymutil; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_DSYMUTIL+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_DSYMUTIL"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_DSYMUTIL"; then
   ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
 if test -n "$ac_ct_DSYMUTIL"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
-printf "%s\n" "$ac_ct_DSYMUTIL" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+$as_echo "$ac_ct_DSYMUTIL" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_DSYMUTIL" = x; then
@@ -95378,8 +90129,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     DSYMUTIL=$ac_ct_DSYMUTIL
@@ -95391,44 +90142,38 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_NMEDIT+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$NMEDIT"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$NMEDIT"; then
   ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 NMEDIT=$ac_cv_prog_NMEDIT
 if test -n "$NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
-printf "%s\n" "$NMEDIT" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+$as_echo "$NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
 
@@ -95437,44 +90182,38 @@
   ac_ct_NMEDIT=$NMEDIT
   # Extract the first word of "nmedit", so it can be a program name with args.
 set dummy nmedit; ac_word=$2
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-printf %s "checking for $ac_word... " >&6; }
-if test ${ac_cv_prog_ac_ct_NMEDIT+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -n "$ac_ct_NMEDIT"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_NMEDIT"; then
   ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
+  test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
   done
 IFS=$as_save_IFS
 
-fi ;;
-esac
+fi
 fi
 ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
 if test -n "$ac_ct_NMEDIT"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
-printf "%s\n" "$ac_ct_NMEDIT" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+$as_echo "$ac_ct_NMEDIT" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 
   if test "x$ac_ct_NMEDIT" = x; then
@@ -95482,8 +90221,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
     NMEDIT=$ac_ct_NMEDIT
@@ -95493,13 +90232,12 @@
 fi
 
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
-printf %s "checking for -single_module linker flag... " >&6; }
-if test ${lt_cv_apple_cc_single_mod+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_apple_cc_single_mod=no
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+$as_echo_n "checking for -single_module linker flag... " >&6; }
+if ${lt_cv_apple_cc_single_mod+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_apple_cc_single_mod=no
       if test -z "${LT_MULTI_MODULE}"; then
    # By default we will add the -single_module flag. You can override
    # by either setting the environment variable LT_MULTI_MODULE
@@ -95513,24 +90251,22 @@
      rm -rf libconftest.dylib*
    fi
    rm conftest.c
-      fi ;;
-esac
+      fi
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-printf "%s\n" "$lt_cv_apple_cc_single_mod" >&6; }
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-printf %s "checking for -exported_symbols_list linker flag... " >&6; }
-if test ${lt_cv_ld_exported_symbols_list+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_ld_exported_symbols_list=no
+{ $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 ${lt_cv_ld_exported_symbols_list+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_exported_symbols_list=no
       save_LDFLAGS=$LDFLAGS
       echo "_main" > conftest.sym
       LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
 
 cat > conftest.$ac_ext <<EOF
-#line 95533 "configure"
+#line 90269 "configure"
 #include "confdefs.h"
 int main(void) {
 ; return 0; }
@@ -95538,7 +90274,7 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
  lt_cv_ld_exported_symbols_list=yes
   rm -rf conftest*
@@ -95550,11 +90286,10 @@
 fi
 rm -f conftest*
    LDFLAGS="$save_LDFLAGS"
-     ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-printf "%s\n" "$lt_cv_ld_exported_symbols_list" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
     case $host_os in
     rhapsody* | darwin1.[0123])
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -95595,8 +90330,7 @@
 enable_win32_dll=no
 
 # Check whether --enable-libtool-lock was given.
-if test ${enable_libtool_lock+y}
-then :
+if test "${enable_libtool_lock+set}" = set; then :
   enableval=$enable_libtool_lock;
 fi
 
@@ -95604,12 +90338,10 @@
 
 
 # Check whether --with-pic was given.
-if test ${with_pic+y}
-then :
+if test "${with_pic+set}" = set; then :
   withval=$with_pic; pic_mode="$withval"
-else case e in #(
-  e) pic_mode=default ;;
-esac
+else
+  pic_mode=default
 fi
 
 test -z "$pic_mode" && pic_mode=default
@@ -95673,13 +90405,12 @@
   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-printf %s "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test ${lt_cv_prog_compiler_rtti_exceptions+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_prog_compiler_rtti_exceptions=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_rtti_exceptions=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="-fno-rtti -fno-exceptions"
@@ -95692,11 +90423,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:95695: $lt_compile\"" >&5)
+   (eval echo "\"configure:90426: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "configure:95699: \$? = $ac_status" >&5
+   echo "configure:90430: \$? = $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.
@@ -95707,11 +90438,10 @@
      fi
    fi
    $rm conftest*
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-printf "%s\n" "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
 
 if test 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"
@@ -95725,8 +90455,8 @@
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-printf %s "checking for $compiler option to produce PIC... " >&6; }
+{ $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,'
@@ -95965,21 +90695,20 @@
     esac
   fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-printf "%s\n" "$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
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test ${lt_cv_prog_compiler_pic_works+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_prog_compiler_pic_works=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
@@ -95992,11 +90721,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:95995: $lt_compile\"" >&5)
+   (eval echo "\"configure:90724: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "configure:95999: \$? = $ac_status" >&5
+   echo "configure:90728: \$? = $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.
@@ -96007,11 +90736,10 @@
      fi
    fi
    $rm conftest*
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_pic_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
     case $lt_prog_compiler_pic in
@@ -96038,13 +90766,12 @@
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test ${lt_cv_prog_compiler_static_works+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_prog_compiler_static_works=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -96065,11 +90792,10 @@
    fi
    $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
-printf "%s\n" "$lt_cv_prog_compiler_static_works" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
 
 if test x"$lt_cv_prog_compiler_static_works" = xyes; then
     :
@@ -96078,13 +90804,12 @@
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test ${lt_cv_prog_compiler_c_o+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_prog_compiler_c_o=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
@@ -96100,11 +90825,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:96103: $lt_compile\"" >&5)
+   (eval echo "\"configure:90828: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "configure:96107: \$? = $ac_status" >&5
+   echo "configure:90832: \$? = $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
@@ -96124,37 +90849,36 @@
    cd ..
    rmdir conftest
    $rm conftest*
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
-printf "%s\n" "$lt_cv_prog_compiler_c_o" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
 
 
 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
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-printf %s "checking if we can lock with hard links... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-printf "%s\n" "$hard_links" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   runpath_var=
   allow_undefined_flag=
@@ -96565,7 +91289,7 @@
        # Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 96568 "configure"
+#line 91292 "configure"
 #include "confdefs.h"
 int main(void) {
 ; return 0; }
@@ -96573,7 +91297,7 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 
 lt_aix_libpath_sed='
@@ -96607,7 +91331,7 @@
 	 # Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 96610 "configure"
+#line 91334 "configure"
 #include "confdefs.h"
 int main(void) {
 ; return 0; }
@@ -96615,7 +91339,7 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 
 lt_aix_libpath_sed='
@@ -97081,8 +91805,8 @@
     esac
   fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
-printf "%s\n" "$ld_shlibs" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+$as_echo "$ld_shlibs" >&6; }
 test "$ld_shlibs" = no && can_build_shared=no
 
 #
@@ -97102,15 +91826,15 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-printf %s "checking whether -lc should be explicitly linked in... " >&6; }
+      { $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\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -97128,7 +91852,7 @@
         if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
         then
 	  archive_cmds_need_lc=no
@@ -97140,16 +91864,16 @@
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-printf "%s\n" "$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
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-printf %s "checking dynamic linker characteristics... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -97757,25 +92481,21 @@
   dynamic_linker=no
   ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-printf "%s\n" "$dynamic_linker" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
-if test ${lt_cv_sys_lib_search_path_spec+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ;;
-esac
+if ${lt_cv_sys_lib_search_path_spec+:} false; 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+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ;;
-esac
+if ${lt_cv_sys_lib_dlsearch_path_spec+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 fi
 
 sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
@@ -97785,8 +92505,8 @@
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-printf %s "checking how to hardcode library paths into programs... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
    test -n "$runpath_var" || \
@@ -97810,8 +92530,8 @@
   # directories.
   hardcode_action=unsupported
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
-printf "%s\n" "$hardcode_action" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+$as_echo "$hardcode_action" >&6; }
 
 if test "$hardcode_action" = relink; then
   # Fast installation is not supported
@@ -97824,13 +92544,13 @@
 
 striplib=
 old_striplib=
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
-printf %s "checking whether stripping libraries is possible... " >&6; }
+{ $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"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
 else
 # FIXME - insert some real tests, host_os isn't really good enough
   case $host_os in
@@ -97838,16 +92558,16 @@
        if test -n "$STRIP" ; then
          striplib="$STRIP -x"
          old_striplib="$STRIP -S"
-         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-printf "%s\n" "yes" >&6; }
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
        else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
        ;;
    *)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
     ;;
   esac
 fi
@@ -97879,281 +92599,233 @@
 
   darwin*)
   # if libdl is installed we need to link against it
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-printf %s "checking for dlopen in -ldl... " >&6; }
-if test ${ac_cv_lib_dl_dlopen+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dlopen (void);
+char dlopen ();
 int
-main (void)
+main ()
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
-else case e in #(
-  e) ac_cv_lib_dl_dlopen=no ;;
-esac
+else
+  ac_cv_lib_dl_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else case e in #(
-  e)
+else
+
     lt_cv_dlopen="dyld"
     lt_cv_dlopen_libs=
     lt_cv_dlopen_self=yes
-     ;;
-esac
+
 fi
 
    ;;
 
   *)
     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = xyes
-then :
+if test "x$ac_cv_func_shl_load" = xyes; then :
   lt_cv_dlopen="shl_load"
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-printf %s "checking for shl_load in -ldld... " >&6; }
-if test ${ac_cv_lib_dld_shl_load+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
+$as_echo_n "checking for shl_load in -ldld... " >&6; }
+if ${ac_cv_lib_dld_shl_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char shl_load (void);
+char shl_load ();
 int
-main (void)
+main ()
 {
 return shl_load ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dld_shl_load=yes
-else case e in #(
-  e) ac_cv_lib_dld_shl_load=no ;;
-esac
+else
+  ac_cv_lib_dld_shl_load=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-printf "%s\n" "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-else case e in #(
-  e) ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = xyes
-then :
+else
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen"
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-printf %s "checking for dlopen in -ldl... " >&6; }
-if test ${ac_cv_lib_dl_dlopen+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+$as_echo_n "checking for dlopen in -ldl... " >&6; }
+if ${ac_cv_lib_dl_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dlopen (void);
+char dlopen ();
 int
-main (void)
+main ()
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dl_dlopen=yes
-else case e in #(
-  e) ac_cv_lib_dl_dlopen=no ;;
-esac
+else
+  ac_cv_lib_dl_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
-printf %s "checking for dlopen in -lsvld... " >&6; }
-if test ${ac_cv_lib_svld_dlopen+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
+$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+if ${ac_cv_lib_svld_dlopen+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dlopen (void);
+char dlopen ();
 int
-main (void)
+main ()
 {
 return dlopen ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_svld_dlopen=yes
-else case e in #(
-  e) ac_cv_lib_svld_dlopen=no ;;
-esac
+else
+  ac_cv_lib_svld_dlopen=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
-printf "%s\n" "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+$as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else case e in #(
-  e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
-printf %s "checking for dld_link in -ldld... " >&6; }
-if test ${ac_cv_lib_dld_dld_link+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) ac_check_lib_save_LIBS=$LIBS
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+$as_echo_n "checking for dld_link in -ldld... " >&6; }
+if ${ac_cv_lib_dld_dld_link+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* 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.
-   The 'extern "C"' is for builds by C++ compilers;
-   although this is not generally supported in C code supporting it here
-   has little cost and some practical benefit (sr 110532).  */
+   builtin and then its argument prototype would still apply.  */
 #ifdef __cplusplus
 extern "C"
 #endif
-char dld_link (void);
+char dld_link ();
 int
-main (void)
+main ()
 {
 return dld_link ();
   ;
   return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"
-then :
+if ac_fn_c_try_link "$LINENO"; then :
   ac_cv_lib_dld_dld_link=yes
-else case e in #(
-  e) ac_cv_lib_dld_dld_link=no ;;
-esac
+else
+  ac_cv_lib_dld_dld_link=no
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam \
+rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS ;;
-esac
+LIBS=$ac_check_lib_save_LIBS
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
-printf "%s\n" "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = xyes
-then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+$as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
-	       ;;
-esac
+
 fi
 
-	     ;;
-esac
+
 fi
 
-	   ;;
-esac
+
 fi
 
-	 ;;
-esac
+
 fi
 
-       ;;
-esac
+
 fi
 
     ;;
@@ -98176,19 +92848,18 @@
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
-printf %s "checking whether a program can dlopen itself... " >&6; }
-if test ${lt_cv_dlopen_self+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) 	  if test "$cross_compiling" = yes; then :
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+$as_echo_n "checking whether a program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 98191 "configure"
+#line 92862 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -98251,7 +92922,7 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -98267,27 +92938,25 @@
 fi
 rm -fr conftest*
 
-     ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
-printf "%s\n" "$lt_cv_dlopen_self" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+$as_echo "$lt_cv_dlopen_self" >&6; }
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
-printf %s "checking whether a statically linked program can dlopen itself... " >&6; }
-if test ${lt_cv_dlopen_self_static+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) 	  if test "$cross_compiling" = yes; then :
+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+if ${lt_cv_dlopen_self_static+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  	  if test "$cross_compiling" = yes; then :
   lt_cv_dlopen_self_static=cross
 else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 98290 "configure"
+#line 92959 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -98350,7 +93019,7 @@
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) >&5 2>/dev/null
     lt_status=$?
@@ -98366,11 +93035,10 @@
 fi
 rm -fr conftest*
 
-       ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
-printf "%s\n" "$lt_cv_dlopen_self_static" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+$as_echo "$lt_cv_dlopen_self_static" >&6; }
     fi
 
     CPPFLAGS="$save_CPPFLAGS"
@@ -98392,13 +93060,13 @@
 
 
 # Report which library types will actually be built
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
-printf %s "checking if libtool supports shared libraries... " >&6; }
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
-printf "%s\n" "$can_build_shared" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+$as_echo_n "checking if libtool supports shared libraries... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+$as_echo "$can_build_shared" >&6; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
-printf %s "checking whether to build shared libraries... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
 test "$can_build_shared" = "no" && enable_shared=no
 
 # On AIX, shared libraries and static libraries use the same namespace, and
@@ -98418,15 +93086,15 @@
   fi
     ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
-printf "%s\n" "$enable_shared" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
-printf %s "checking whether to build static libraries... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+$as_echo_n "checking whether to build static libraries... " >&6; }
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
-printf "%s\n" "$enable_static" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+$as_echo "$enable_static" >&6; }
 
 # The else clause should only fire when bootstrapping the
 # libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -98519,9 +93187,9 @@
 cfgfile="${ofile}T"
   trap "$rm \"$cfgfile\"; exit 1" 1 2 15
   $rm -f "$cfgfile"
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result:
 creating $ofile" >&5
-printf "%s\n" "
+$as_echo "
 creating $ofile" >&6; }
 
   cat <<__EOF__ >> "$cfgfile"
@@ -98927,26 +93595,25 @@
 
 
 # Check whether --with-tags was given.
-if test ${with_tags+y}
-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
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: output file '$ofile' does not exist" >&5
-printf "%s\n" "$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
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: output file '$ofile' does not look like a libtool script" >&5
-printf "%s\n" "$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
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using 'LTCC=$LTCC', extracted from '$ofile'" >&5
-printf "%s\n" "$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
@@ -99102,19 +93769,17 @@
 
 
 # Check whether --with-gnu-ld was given.
-if test ${with_gnu_ld+y}
-then :
+if test "${with_gnu_ld+set}" = set; then :
   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else case e in #(
-  e) with_gnu_ld=no ;;
-esac
+else
+  with_gnu_ld=no
 fi
 
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-printf %s "checking for ld used by $CC... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+$as_echo_n "checking for ld used by $CC... " >&6; }
   case $host in
   *-*-mingw*)
     # gcc leaves a trailing carriage return which upsets mingw
@@ -99143,17 +93808,16 @@
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-printf %s "checking for GNU ld... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+$as_echo_n "checking for GNU ld... " >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-printf %s "checking for non-GNU ld... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+$as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test ${lt_cv_path_LD+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) if test -z "$LD"; then
+if ${lt_cv_path_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$LD"; then
   lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
   for ac_dir in $PATH; do
     IFS="$lt_save_ifs"
@@ -99176,26 +93840,24 @@
   IFS="$lt_save_ifs"
 else
   lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi ;;
-esac
+fi
 fi
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-printf "%s\n" "$LD" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
-printf "%s\n" "no" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
-if test ${lt_cv_prog_gnu_ld+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) # I'd rather use --version here, but apparently some GNU lds only accept -v.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+if ${lt_cv_prog_gnu_ld+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=yes
@@ -99203,11 +93865,10 @@
 *)
   lt_cv_prog_gnu_ld=no
   ;;
-esac ;;
 esac
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
-printf "%s\n" "$lt_cv_prog_gnu_ld" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+$as_echo "$lt_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
 
@@ -99257,8 +93918,8 @@
 fi
 
 # PORTME: fill in a description of your system's C++ link characteristics
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 ld_shlibs_CXX=yes
 case $host_os in
   aix3*)
@@ -99356,7 +94017,7 @@
       # Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 99359 "configure"
+#line 94020 "configure"
 #include "confdefs.h"
 int main(void) {
 ; return 0; }
@@ -99364,7 +94025,7 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 
 lt_aix_libpath_sed='
@@ -99399,7 +94060,7 @@
 	# Determine the default libpath from the value encoded in an empty executable.
 
 cat > conftest.$ac_ext <<EOF
-#line 99402 "configure"
+#line 94063 "configure"
 #include "confdefs.h"
 int main(void) {
 ; return 0; }
@@ -99407,7 +94068,7 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 
 lt_aix_libpath_sed='
@@ -100155,8 +94816,8 @@
     ld_shlibs_CXX=no
     ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-printf "%s\n" "$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"
@@ -100179,7 +94840,7 @@
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   # Parse the compiler output and extract the necessary
   # objects, libraries and library flags.
@@ -100335,8 +94996,8 @@
 lt_prog_compiler_pic_CXX=
 lt_prog_compiler_static_CXX=
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-printf %s "checking for $compiler option to produce PIC... " >&6; }
+{ $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
@@ -100625,21 +95286,20 @@
     esac
   fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
-printf "%s\n" "$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
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-printf %s "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-if test ${lt_cv_prog_compiler_pic_works_CXX+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_prog_compiler_pic_works_CXX=no
+{ $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 ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_works_CXX=no
   ac_outfile=conftest.$ac_objext
    echo "$lt_simple_compile_test_code" > conftest.$ac_ext
    lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
@@ -100652,11 +95312,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:100655: $lt_compile\"" >&5)
+   (eval echo "\"configure:95315: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "configure:100659: \$? = $ac_status" >&5
+   echo "configure:95319: \$? = $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.
@@ -100667,11 +95327,10 @@
      fi
    fi
    $rm conftest*
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
-printf "%s\n" "$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
@@ -100698,13 +95357,12 @@
 # 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\"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-printf %s "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test ${lt_cv_prog_compiler_static_works_CXX+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_prog_compiler_static_works_CXX=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_static_works_CXX=no
    save_LDFLAGS="$LDFLAGS"
    LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
    echo "$lt_simple_link_test_code" > conftest.$ac_ext
@@ -100725,11 +95383,10 @@
    fi
    $rm -r conftest*
    LDFLAGS="$save_LDFLAGS"
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works_CXX" >&5
-printf "%s\n" "$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
     :
@@ -100738,13 +95395,12 @@
 fi
 
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
-printf %s "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test ${lt_cv_prog_compiler_c_o_CXX+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_prog_compiler_c_o_CXX=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_c_o_CXX=no
    $rm -r conftest 2>/dev/null
    mkdir conftest
    cd conftest
@@ -100760,11 +95416,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"configure:100763: $lt_compile\"" >&5)
+   (eval echo "\"configure:95419: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "configure:100767: \$? = $ac_status" >&5
+   echo "configure:95423: \$? = $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
@@ -100784,37 +95440,36 @@
    cd ..
    rmdir conftest
    $rm conftest*
- ;;
-esac
+
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-printf "%s\n" "$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
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
-printf %s "checking if we can lock with hard links... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+$as_echo_n "checking if we can lock with hard links... " >&6; }
   hard_links=yes
   $rm conftest*
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
-printf "%s\n" "$hard_links" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+$as_echo "$hard_links" >&6; }
   if test "$hard_links" = no; then
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
-printf "%s\n" "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&5
+$as_echo "$as_me: WARNING: '$CC' does not support '-c -o', so 'make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
 else
   need_locks=no
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-printf %s "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   case $host_os in
@@ -100839,8 +95494,8 @@
   esac
   exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
-printf "%s\n" "$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
 
 #
@@ -100860,15 +95515,15 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
-printf %s "checking whether -lc should be explicitly linked in... " >&6; }
+      { $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\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
         soname=conftest
         lib=conftest
@@ -100886,7 +95541,7 @@
         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=$?
-  printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
         then
 	  archive_cmds_need_lc_CXX=no
@@ -100898,16 +95553,16 @@
         cat conftest.err 1>&5
       fi
       $rm conftest*
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
-printf "%s\n" "$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
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-printf %s "checking dynamic linker characteristics... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+$as_echo_n "checking dynamic linker characteristics... " >&6; }
 library_names_spec=
 libname_spec='lib$name'
 soname_spec=
@@ -101463,25 +96118,21 @@
   dynamic_linker=no
   ;;
 esac
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
-printf "%s\n" "$dynamic_linker" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+$as_echo "$dynamic_linker" >&6; }
 test "$dynamic_linker" = no && can_build_shared=no
 
-if test ${lt_cv_sys_lib_search_path_spec+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" ;;
-esac
+if ${lt_cv_sys_lib_search_path_spec+:} false; 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+y}
-then :
-  printf %s "(cached) " >&6
-else case e in #(
-  e) lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" ;;
-esac
+if ${lt_cv_sys_lib_dlsearch_path_spec+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
 fi
 
 sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
@@ -101491,8 +96142,8 @@
   variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 fi
 
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
-printf %s "checking how to hardcode library paths into programs... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_CXX=
 if test -n "$hardcode_libdir_flag_spec_CXX" || \
    test -n "$runpath_var_CXX" || \
@@ -101516,8 +96167,8 @@
   # directories.
   hardcode_action_CXX=unsupported
 fi
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $hardcode_action_CXX" >&5
-printf "%s\n" "$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
@@ -102029,10 +96680,10 @@
 CC=$old_CC
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: " >&5
-printf "%s\n" "" >&6; }
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ${T_MD}Generating files${T_ME}" >&5
-printf "%s\n" "${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
@@ -102523,7 +97174,7 @@
 
 
 
-printf "%s\n" "#define HAVE_BUILD_DEFS_H 1" >>confdefs.h
+$as_echo "#define HAVE_BUILD_DEFS_H 1" >>confdefs.h
 
 
 $php_shtool mkdir -p pear
@@ -102552,8 +97203,8 @@
 # config.status only pays attention to the cache file if you give it
 # the --recheck option to rerun configure.
 #
-# 'ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* 'ac_cv_foo' will be assigned the
+# `ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* `ac_cv_foo' will be assigned the
 # following values.
 
 _ACEOF
@@ -102569,8 +97220,8 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
       esac
       case $ac_var in #(
       _ | IFS | as_nl) ;; #(
@@ -102583,14 +97234,14 @@
   (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
+      # `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"
       ;; #(
     *)
-      # 'set' quotes correctly as required by POSIX, so do not add quotes.
+      # `set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
       ;;
     esac |
@@ -102600,15 +97251,15 @@
      /^ac_cv_env_/b end
      t clear
      :clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test ${\1+y} || &/
+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
      t end
      s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     if test "x$cache_file" != "x/dev/null"; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
       if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
       else
@@ -102622,8 +97273,8 @@
       fi
     fi
   else
-    { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -102640,7 +97291,7 @@
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
+  ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -102652,8 +97303,8 @@
 
 
 
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: patching main/php_config.h.in" >&5
-printf "%s\n" "$as_me: patching main/php_config.h.in" >&6;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: patching main/php_config.h.in" >&5
+$as_echo "$as_me: patching main/php_config.h.in" >&6;}
 
   $SED -e 's/^#undef PACKAGE_[^ ]*/\/\* & \*\//g' < $srcdir/main/php_config.h.in \
     > $srcdir/main/php_config.h.in.tmp && mv $srcdir/main/php_config.h.in.tmp $srcdir/main/php_config.h.in
@@ -102663,8 +97314,8 @@
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
@@ -102687,65 +97338,63 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
-then :
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
   NULLCMD=:
   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'='"$@"'
   setopt NO_GLOB_SUBST
-else case e in #(
-  e) case `(set -o) 2>/dev/null` in #(
+else
+  case `(set -o) 2>/dev/null` in #(
   *posix*) :
     set -o posix ;; #(
   *) :
      ;;
-esac ;;
 esac
 fi
 
 
-
-# Reset variables that may have inherited troublesome values from
-# the environment.
-
-# IFS needs to be set, to space, tab, and newline, in precisely that order.
-# (If _AS_PATH_WALK were called with IFS unset, it would have the
-# side effect of setting IFS to empty, thus disabling word splitting.)
-# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-IFS=" ""	$as_nl"
-
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# Ensure predictable behavior from utilities with locale-dependent output.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# We cannot yet rely on "unset" to work, but we need these variables
-# to be unset--not just set to an empty or harmless value--now, to
-# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh).  This construct
-# also avoids known problems related to "unset" and subshell syntax
-# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
-for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
-do eval test \${$as_var+y} \
-  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-
-# Ensure that fds 0, 1, and 2 are open.
-if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
-if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
-if (exec 3>&2)            ; then :; else exec 2>/dev/null; fi
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
 
 # The user is always right.
-if ${PATH_SEPARATOR+false} :; then
+if test "${PATH_SEPARATOR+set}" != set; then
   PATH_SEPARATOR=:
   (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
     (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -102754,6 +97403,13 @@
 fi
 
 
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
 # Find who we are.  Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -102762,27 +97418,43 @@
 for as_dir in $PATH
 do
   IFS=$as_save_IFS
-  case $as_dir in #(((
-    '') as_dir=./ ;;
-    */) ;;
-    *) as_dir=$as_dir/ ;;
-  esac
-    test -r "$as_dir$0" && as_myself=$as_dir$0 && break
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
   done
 IFS=$as_save_IFS
 
      ;;
 esac
-# We did not find ourselves, most probably we were run as 'sh COMMAND'
+# We did not find ourselves, most probably we were run as `sh COMMAND'
 # in which case we are not to be found in the path.
 if test "x$as_myself" = x; then
   as_myself=$0
 fi
 if test ! -f "$as_myself"; then
-  printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
   exit 1
 fi
 
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
 # as_fn_error STATUS ERROR [LINENO LOG_FD]
@@ -102795,9 +97467,9 @@
   as_status=$1; test $as_status -eq 0 && as_status=1
   if test "$4"; then
     as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
   fi
-  printf "%s\n" "$as_me: error: $2" >&2
+  $as_echo "$as_me: error: $2" >&2
   as_fn_exit $as_status
 } # as_fn_error
 
@@ -102828,25 +97500,22 @@
   { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
-
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
-then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
   eval 'as_fn_append ()
   {
     eval $1+=\$2
   }'
-else case e in #(
-  e) as_fn_append ()
+else
+  as_fn_append ()
   {
     eval $1=\$$1\$2
-  } ;;
-esac
+  }
 fi # as_fn_append
 
 # as_fn_arith ARG...
@@ -102854,18 +97523,16 @@
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
-then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
   eval 'as_fn_arith ()
   {
     as_val=$(( $* ))
   }'
-else case e in #(
-  e) as_fn_arith ()
+else
+  as_fn_arith ()
   {
     as_val=`expr "$@" || test $? -eq 1`
-  } ;;
-esac
+  }
 fi # as_fn_arith
 
 
@@ -102892,7 +97559,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -102914,10 +97581,6 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
-
-# Determine whether it's possible to make 'echo' print without a newline.
-# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
-# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -102931,12 +97594,6 @@
   ECHO_N='-n';;
 esac
 
-# For backward compatibility with old third-party macros, we provide
-# the shell variables $as_echo and $as_echo_n.  New code should use
-# AS_ECHO(["message"]) and AS_ECHO_N(["message"]), respectively.
-as_echo='printf %s\n'
-as_echo_n='printf %s'
-
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
   rm -f conf$$.dir/conf$$.file
@@ -102948,9 +97605,9 @@
   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 -pR'.
+    # 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 -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
       as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
@@ -102978,7 +97635,7 @@
     as_dirs=
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=$as_dir;;
       esac
       as_dirs="'$as_qdir' $as_dirs"
@@ -102987,7 +97644,7 @@
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -103031,12 +97688,10 @@
 as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
-as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 
 # Sed expression to map a string onto a valid variable name.
-as_sed_sh="y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-as_tr_sh="eval sed '$as_sed_sh'" # deprecated
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
 exec 6>&1
@@ -103051,8 +97706,8 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by PHP $as_me 8.2.29, which was
-generated by GNU Autoconf 2.72.  Invocation command line was
+This file was extended by PHP $as_me 8.2.30, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -103084,7 +97739,7 @@
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-'$as_me' instantiates files and other configuration actions
+\`$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.
 
@@ -103115,16 +97770,14 @@
 PHP home page: <https://www.php.net>."
 
 _ACEOF
-ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
-ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config='$ac_cs_config_escaped'
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-PHP config.status 8.2.29
-configured by $0, generated by GNU Autoconf 2.72,
+PHP config.status 8.2.30
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2023 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -103161,15 +97814,15 @@
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    printf "%s\n" "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --config | --confi | --conf | --con | --co | --c )
-    printf "%s\n" "$ac_cs_config"; exit ;;
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     '') as_fn_error $? "missing file argument" ;;
     esac
     as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -103177,23 +97830,23 @@
   --header | --heade | --head | --hea )
     $ac_shift
     case $ac_optarg in
-    *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     as_fn_append CONFIG_HEADERS " '$ac_optarg'"
     ac_need_defaults=false;;
   --he | --h)
     # Conflict between --help and --header
-    as_fn_error $? "ambiguous option: '$1'
-Try '$0 --help' for more information.";;
+    as_fn_error $? "ambiguous option: \`$1'
+Try \`$0 --help' for more information.";;
   --help | --hel | -h )
-    printf "%s\n" "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=: ;;
 
   # This is an error.
-  -*) as_fn_error $? "unrecognized option: '$1'
-Try '$0 --help' for more information." ;;
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
 
   *) as_fn_append ac_config_targets " $1"
      ac_need_defaults=false ;;
@@ -103214,7 +97867,7 @@
 if \$ac_cs_recheck; then
   set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
-  \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
   export CONFIG_SHELL
   exec "\$@"
@@ -103228,7 +97881,7 @@
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  printf "%s\n" "$ac_log"
+  $as_echo "$ac_log"
 } >&5
 
 _ACEOF
@@ -103302,7 +97955,7 @@
     "$ALL_OUTPUT_FILES") CONFIG_FILES="$CONFIG_FILES $ALL_OUTPUT_FILES" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 
-  *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -103312,9 +97965,9 @@
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
-  test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
-  test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers
-  test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
 fi
 
 # Have a temporary directory for convenience.  Make it in the build tree
@@ -103322,7 +97975,7 @@
 # creating and moving files from /tmp can sometimes cause problems.
 # Hook for its removal unless debugging.
 # Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to '$tmp'.
+# after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
   tmp= ac_tmp=
@@ -103346,7 +97999,7 @@
 
 # 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'.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
 
@@ -103504,13 +98157,13 @@
 
 # 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'.
+# This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
 cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
-# Transform confdefs.h into an awk script 'defines.awk', embedded as
+# 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.
 
@@ -103620,7 +98273,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -103642,33 +98295,33 @@
       -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain ':'.
+	 # because $ac_f cannot contain `:'.
 	 test -f "$ac_f" ||
 	   case $ac_f in
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
-      case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
     done
 
-    # Let's still pretend it is 'configure' which instantiates (i.e., don't
+    # 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 '`
-	  printf "%s\n" "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
 	`' by configure.'
     if test x"$ac_file" != x-; then
       configure_input="$ac_file.  $configure_input"
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-printf "%s\n" "$as_me: creating $ac_file" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
     fi
     # Neutralize special characters interpreted by sed in replacement strings.
     case $configure_input in #(
     *\&* | *\|* | *\\* )
-       ac_sed_conf_input=`printf "%s\n" "$configure_input" |
+       ac_sed_conf_input=`$as_echo "$configure_input" |
        sed 's/[\\\\&|]/\\\\&/g'`;; #(
     *) ac_sed_conf_input=$configure_input;;
     esac
@@ -103685,7 +98338,7 @@
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-printf "%s\n" X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -103709,9 +98362,9 @@
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
-  ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'`
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -103764,8 +98417,8 @@
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
   ac_datarootdir_hack='
@@ -103778,7 +98431,7 @@
 esac
 _ACEOF
 
-# Neutralize VPATH when '$srcdir' = '.'.
+# 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 || ac_write_fail=1
@@ -103807,9 +98460,9 @@
   { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
       "$ac_tmp/out"`; test -z "$ac_out"; } &&
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
-printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
   rm -f "$ac_tmp/stdin"
@@ -103825,27 +98478,27 @@
   #
   if test x"$ac_file" != x-; then
     {
-      printf "%s\n" "/* $configure_input  */" >&1 \
+      $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
     } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
     if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
-      { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+$as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
       mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
-    printf "%s\n" "/* $configure_input  */" >&1 \
+    $as_echo "/* $configure_input  */" \
       && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
  ;;
 
-  :C)  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
  ;;
   esac
 
@@ -103901,8 +98554,7 @@
   $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
-
diff -Nru php8.2-8.2.29/configure.ac php8.2-8.2.30/configure.ac
--- php8.2-8.2.29/configure.ac	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/configure.ac	2025-12-16 17:18:12.000000000 +0000
@@ -17,7 +17,7 @@
 dnl ----------------------------------------------------------------------------
 
 AC_PREREQ([2.68])
-AC_INIT([PHP],[8.2.29],[https://github.com/php/php-src/issues],[php],[https://www.php.net])
+AC_INIT([PHP],[8.2.30],[https://github.com/php/php-src/issues],[php],[https://www.php.net])
 AC_CONFIG_SRCDIR([main/php_version.h])
 AC_CONFIG_AUX_DIR([build])
 AC_PRESERVE_HELP_ORDER
diff -Nru php8.2-8.2.29/debian/changelog php8.2-8.2.30/debian/changelog
--- php8.2-8.2.29/debian/changelog	2025-07-03 16:16:05.000000000 +0000
+++ php8.2-8.2.30/debian/changelog	2026-02-28 07:07:34.000000000 +0000
@@ -1,3 +1,15 @@
+php8.2 (8.2.30-1~deb12u1) bookworm-security; urgency=high
+
+  * New upstream version 8.2.30
+   + [CVE-2025-14180]: Fixed GHSA-8xr5-qppj-gvwj (PDO quoting result null
+     deref).
+   + [CVE-2025-14178]: Fixed GHSA-h96m-rvf9-jgm2 (Heap buffer overflow in
+     array_merge()).
+   + [CVE-2025-14177]: Fixed GHSA-3237-qqm7-mfv7 (Information Leak of
+     Memory in getimagesize).
+
+ -- Ondřej Surý <ondrej@debian.org>  Sat, 28 Feb 2026 08:07:34 +0100
+
 php8.2 (8.2.29-1~deb12u1) bookworm-security; urgency=high
 
   * New upstream version 8.2.29
diff -Nru php8.2-8.2.29/ext/ctype/tests/lc_ctype_inheritance.phpt php8.2-8.2.30/ext/ctype/tests/lc_ctype_inheritance.phpt
--- php8.2-8.2.29/ext/ctype/tests/lc_ctype_inheritance.phpt	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/ctype/tests/lc_ctype_inheritance.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -4,6 +4,9 @@
 ctype
 --SKIPIF--
 <?php
+if (PHP_OS_FAMILY === 'Darwin' && version_compare(php_uname('r'), '24.0.0', '>=')) {
+    die('skip macOS 15 inherits LC_CTYPE into the thread locale');
+}
 if (setlocale(LC_ALL, 'invalid') === 'invalid') { die('skip setlocale() is broken /w musl'); }
 if (!setlocale(LC_CTYPE, "de_DE", "de-DE")) die("skip requires de_DE locale");
 ?>
diff -Nru php8.2-8.2.29/ext/curl/interface.c php8.2-8.2.30/ext/curl/interface.c
--- php8.2-8.2.29/ext/curl/interface.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/curl/interface.c	2025-12-16 17:18:12.000000000 +0000
@@ -667,11 +667,11 @@
 /* }}} */
 
 /* {{{ curl_progress */
-static size_t curl_progress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow)
+static int curl_progress(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow)
 {
 	php_curl *ch = (php_curl *)clientp;
 	php_curl_callback *t = ch->handlers.progress;
-	size_t	rval = 0;
+	int rval = 0;
 
 #if PHP_CURL_DEBUG
 	fprintf(stderr, "curl_progress() called\n");
@@ -716,11 +716,11 @@
 
 #if LIBCURL_VERSION_NUM >= 0x072000
 /* {{{ curl_xferinfo */
-static size_t curl_xferinfo(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
+static int curl_xferinfo(void *clientp, curl_off_t dltotal, curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
 {
 	php_curl *ch = (php_curl *)clientp;
 	php_curl_callback *t = ch->handlers.xferinfo;
-	size_t rval = 0;
+	int rval = 0;
 
 #if PHP_CURL_DEBUG
 	fprintf(stderr, "curl_xferinfo() called\n");
@@ -1085,8 +1085,8 @@
 {
 	char *cainfo;
 
-	curl_easy_setopt(ch->cp, CURLOPT_NOPROGRESS,        1);
-	curl_easy_setopt(ch->cp, CURLOPT_VERBOSE,           0);
+	curl_easy_setopt(ch->cp, CURLOPT_NOPROGRESS,        1L);
+	curl_easy_setopt(ch->cp, CURLOPT_VERBOSE,           0L);
 	curl_easy_setopt(ch->cp, CURLOPT_ERRORBUFFER,       ch->err.str);
 	curl_easy_setopt(ch->cp, CURLOPT_WRITEFUNCTION,     curl_write);
 	curl_easy_setopt(ch->cp, CURLOPT_FILE,              (void *) ch);
@@ -1095,10 +1095,10 @@
 	curl_easy_setopt(ch->cp, CURLOPT_HEADERFUNCTION,    curl_write_header);
 	curl_easy_setopt(ch->cp, CURLOPT_WRITEHEADER,       (void *) ch);
 #ifndef ZTS
-	curl_easy_setopt(ch->cp, CURLOPT_DNS_USE_GLOBAL_CACHE, 1);
+	curl_easy_setopt(ch->cp, CURLOPT_DNS_USE_GLOBAL_CACHE, 1L);
 #endif
-	curl_easy_setopt(ch->cp, CURLOPT_DNS_CACHE_TIMEOUT, 120);
-	curl_easy_setopt(ch->cp, CURLOPT_MAXREDIRS, 20); /* prevent infinite redirects */
+	curl_easy_setopt(ch->cp, CURLOPT_DNS_CACHE_TIMEOUT, 120L);
+	curl_easy_setopt(ch->cp, CURLOPT_MAXREDIRS, 20L); /* prevent infinite redirects */
 
 	cainfo = INI_STR("openssl.cafile");
 	if (!(cainfo && cainfo[0] != '\0')) {
@@ -1109,7 +1109,7 @@
 	}
 
 #ifdef ZTS
-	curl_easy_setopt(ch->cp, CURLOPT_NOSIGNAL, 1);
+	curl_easy_setopt(ch->cp, CURLOPT_NOSIGNAL, 1L);
 #endif
 }
 /* }}} */
@@ -1616,7 +1616,7 @@
 			lval = zval_get_long(zvalue);
 			if (lval == 1) {
 				php_error_docref(NULL, E_NOTICE, "CURLOPT_SSL_VERIFYHOST no longer accepts the value 1, value 2 will be used instead");
-				error = curl_easy_setopt(ch->cp, option, 2);
+				error = curl_easy_setopt(ch->cp, option, 2L);
 				break;
 			}
 			ZEND_FALLTHROUGH;
@@ -2158,7 +2158,7 @@
 
 		case CURLOPT_FOLLOWLOCATION:
 			lval = zend_is_true(zvalue);
-			error = curl_easy_setopt(ch->cp, option, lval);
+			error = curl_easy_setopt(ch->cp, option, (long) lval);
 			break;
 
 		case CURLOPT_HEADERFUNCTION:
@@ -2176,7 +2176,7 @@
 					/* no need to build the mime structure for empty hashtables;
 					   also works around https://github.com/curl/curl/issues/6455 */
 					curl_easy_setopt(ch->cp, CURLOPT_POSTFIELDS, "");
-					error = curl_easy_setopt(ch->cp, CURLOPT_POSTFIELDSIZE, 0);
+					error = curl_easy_setopt(ch->cp, CURLOPT_POSTFIELDSIZE, 0L);
 				} else {
 					return build_mime_structure_from_hash(ch, zvalue);
 				}
@@ -2255,7 +2255,7 @@
 
 		case CURLOPT_POSTREDIR:
 			lval = zval_get_long(zvalue);
-			error = curl_easy_setopt(ch->cp, CURLOPT_POSTREDIR, lval & CURL_REDIR_POST_ALL);
+			error = curl_easy_setopt(ch->cp, CURLOPT_POSTREDIR, (long) (lval & CURL_REDIR_POST_ALL));
 			break;
 
 		/* the following options deal with files, therefore the open_basedir check
@@ -2290,11 +2290,11 @@
 			if (zend_is_true(zvalue)) {
 				curl_easy_setopt(ch->cp, CURLOPT_DEBUGFUNCTION, curl_debug);
 				curl_easy_setopt(ch->cp, CURLOPT_DEBUGDATA, (void *)ch);
-				curl_easy_setopt(ch->cp, CURLOPT_VERBOSE, 1);
+				curl_easy_setopt(ch->cp, CURLOPT_VERBOSE, 1L);
 			} else {
 				curl_easy_setopt(ch->cp, CURLOPT_DEBUGFUNCTION, NULL);
 				curl_easy_setopt(ch->cp, CURLOPT_DEBUGDATA, NULL);
-				curl_easy_setopt(ch->cp, CURLOPT_VERBOSE, 0);
+				curl_easy_setopt(ch->cp, CURLOPT_VERBOSE, 0L);
 			}
 			break;
 
diff -Nru php8.2-8.2.29/ext/curl/tests/check_win_config.phpt php8.2-8.2.30/ext/curl/tests/check_win_config.phpt
--- php8.2-8.2.29/ext/curl/tests/check_win_config.phpt	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/curl/tests/check_win_config.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -54,7 +54,7 @@
 ZSTD => No
 HSTS => Yes
 GSASL => No
-Protocols => dict, file, ftp, ftps, gopher, %r(gophers, )?%rhttp, https, imap, imaps, ldap, ldaps, %r(mqtt, )?%rpop3, pop3s, rtsp, scp, sftp, smb, smbs, smtp, smtps, telnet, tftp
+Protocols => dict, file, ftp, ftps, gopher, %r(gophers, )?%rhttp, https, imap, imaps, ldap, ldaps, %r(mqtt, )?%rpop3, pop3s, rtsp, scp, sftp, smb, smbs, smtp, smtps, telnet, tftp%r(, ws)?(, wss)?%r
 Host => %s-pc-win32
 SSL Version => OpenSSL/%s
 ZLib Version => %s
diff -Nru php8.2-8.2.29/ext/curl/tests/curl_setopt_ssl.phpt php8.2-8.2.30/ext/curl/tests/curl_setopt_ssl.phpt
--- php8.2-8.2.29/ext/curl/tests/curl_setopt_ssl.phpt	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/curl/tests/curl_setopt_ssl.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -18,9 +18,13 @@
 --FILE--
 <?php
 
-function check_error(CurlHandle $ch) {
+function check_error(CurlHandle $ch, $expected = null) {
     if (curl_errno($ch) !== 0) {
-        echo "CURL ERROR: " . curl_errno($ch) . "\n";
+        $errno = curl_errno($ch);
+        if (!is_null($expected)) {
+            $errno = $errno == $expected ? 'EXPECTED' : "UNEXPECTED(A:$errno,E:$expected)";
+        }
+        echo "CURL ERROR: " . $errno . "\n";
     }
 }
 
@@ -109,7 +113,7 @@
 
     $response = curl_exec($ch);
     check_response($response, $clientCertSubject);
-    check_error($ch);
+    check_error($ch, curl_version()['version_number'] < 0x081000 ? 58 : 43);
     curl_close($ch);
 
     echo "\n";
@@ -203,7 +207,7 @@
 bool(true)
 bool(true)
 client cert subject not in response
-CURL ERROR: 58
+CURL ERROR: EXPECTED
 
 case 4: client cert and key from file
 bool(true)
diff -Nru php8.2-8.2.29/ext/dom/document.c php8.2-8.2.30/ext/dom/document.c
--- php8.2-8.2.29/ext/dom/document.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/dom/document.c	2025-12-16 17:18:12.000000000 +0000
@@ -22,7 +22,6 @@
 #include "php.h"
 #if defined(HAVE_LIBXML) && defined(HAVE_DOM)
 #include "php_dom.h"
-#include <libxml/SAX.h>
 #include <libxml/xmlsave.h>
 #ifdef LIBXML_SCHEMAS_ENABLED
 #include <libxml/relaxng.h>
@@ -1125,7 +1124,7 @@
 	}
 
 	if (encoding_len > 0) {
-		docp->encoding = (const xmlChar *) xmlStrdup((xmlChar *) encoding);
+		docp->encoding = xmlStrdup((const xmlChar *) encoding);
 	}
 
 	intern = Z_DOMOBJ_P(ZEND_THIS);
@@ -1442,12 +1441,16 @@
 	doc_props = dom_get_doc_props(intern->document);
 	format = doc_props->formatoutput;
 	if (options & LIBXML_SAVE_NOEMPTYTAG) {
+		ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")
 		saveempty = xmlSaveNoEmptyTags;
 		xmlSaveNoEmptyTags = 1;
+		ZEND_DIAGNOSTIC_IGNORED_END
 	}
 	bytes = xmlSaveFormatFileEnc(file, docp, NULL, format);
 	if (options & LIBXML_SAVE_NOEMPTYTAG) {
+		ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")
 		xmlSaveNoEmptyTags = saveempty;
+		ZEND_DIAGNOSTIC_IGNORED_END
 	}
 	if (bytes == -1) {
 		RETURN_FALSE;
@@ -1494,12 +1497,16 @@
 			RETURN_FALSE;
 		}
 		if (options & LIBXML_SAVE_NOEMPTYTAG) {
+			ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")
 			saveempty = xmlSaveNoEmptyTags;
 			xmlSaveNoEmptyTags = 1;
+			ZEND_DIAGNOSTIC_IGNORED_END
 		}
 		xmlNodeDump(buf, docp, node, 0, format);
 		if (options & LIBXML_SAVE_NOEMPTYTAG) {
+			ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")
 			xmlSaveNoEmptyTags = saveempty;
+			ZEND_DIAGNOSTIC_IGNORED_END
 		}
 		mem = (xmlChar*) xmlBufferContent(buf);
 		if (!mem) {
@@ -1510,13 +1517,17 @@
 		xmlBufferFree(buf);
 	} else {
 		if (options & LIBXML_SAVE_NOEMPTYTAG) {
+			ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")
 			saveempty = xmlSaveNoEmptyTags;
 			xmlSaveNoEmptyTags = 1;
+			ZEND_DIAGNOSTIC_IGNORED_END
 		}
 		/* Encoding is handled from the encoding property set on the document */
 		xmlDocDumpFormatMemory(docp, &mem, &size, format);
 		if (options & LIBXML_SAVE_NOEMPTYTAG) {
+			ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")
 			xmlSaveNoEmptyTags = saveempty;
+			ZEND_DIAGNOSTIC_IGNORED_END
 		}
 		if (!size || !mem) {
 			RETURN_FALSE;
diff -Nru php8.2-8.2.29/ext/dom/tests/gh10234.phpt php8.2-8.2.30/ext/dom/tests/gh10234.phpt
--- php8.2-8.2.29/ext/dom/tests/gh10234.phpt	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/dom/tests/gh10234.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -55,7 +55,7 @@
 var_dump($document->documentElement->textContent);
 var_dump($document->saveHTML());
 ?>
---EXPECT--
+--EXPECTF--
 -- Attribute tests --
 string(38) "<element attribute="value"></element>
 "
@@ -67,10 +67,10 @@
 string(50) "<element attribute="hello &amp; world"></element>
 "
 string(9) "<b>hi</b>"
-string(54) "<element attribute="&lt;b&gt;hi&lt;/b&gt;"></element>
+string(%d) "<element attribute=%r("&lt;b&gt;hi&lt;\/b&gt;"|"<b>hi<\/b>")%r></element>
 "
 string(12) "quote "test""
-string(45) "<element attribute='quote "test"'></element>
+string(%d) "<element attribute=%r('quote "test"'|"quote &quot;test&quot;")%r></element>
 "
 string(12) "quote 'test'"
 string(45) "<element attribute="quote 'test'"></element>
diff -Nru php8.2-8.2.29/ext/hash/php_hash_xxhash.h php8.2-8.2.30/ext/hash/php_hash_xxhash.h
--- php8.2-8.2.29/ext/hash/php_hash_xxhash.h	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/hash/php_hash_xxhash.h	2025-12-16 17:18:12.000000000 +0000
@@ -18,7 +18,7 @@
 #define PHP_HASH_XXHASH_H
 
 #define XXH_INLINE_ALL 1
-#include "xxhash.h"
+#include "xxhash/xxhash.h"
 
 typedef struct {
 	XXH32_state_t s;
diff -Nru php8.2-8.2.29/ext/imap/tests/CONFLICTS php8.2-8.2.30/ext/imap/tests/CONFLICTS
--- php8.2-8.2.29/ext/imap/tests/CONFLICTS	1970-01-01 00:00:00.000000000 +0000
+++ php8.2-8.2.30/ext/imap/tests/CONFLICTS	2025-12-16 17:18:12.000000000 +0000
@@ -0,0 +1 @@
+imap
diff -Nru php8.2-8.2.29/ext/intl/tests/msgfmt_format_intlcalendar_variant4.phpt php8.2-8.2.30/ext/intl/tests/msgfmt_format_intlcalendar_variant4.phpt
--- php8.2-8.2.29/ext/intl/tests/msgfmt_format_intlcalendar_variant4.phpt	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/intl/tests/msgfmt_format_intlcalendar_variant4.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -29,5 +29,5 @@
 */
 
 ?>
---EXPECT--
-quinta-feira, 17 de maio de 2012 5:35:36 da tarde ptlis
+--EXPECTF--
+quinta-feira, 17 de maio de 2012 5:35:36 %r(da tarde|p.m.)%r ptlis
diff -Nru php8.2-8.2.29/ext/intl/tests/timezone_getDisplayName_variant4.phpt php8.2-8.2.30/ext/intl/tests/timezone_getDisplayName_variant4.phpt
--- php8.2-8.2.29/ext/intl/tests/timezone_getDisplayName_variant4.phpt	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/intl/tests/timezone_getDisplayName_variant4.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -23,12 +23,12 @@
 var_dump($lsb->getDisplayName(false, IntlTimeZone::DISPLAY_GENERIC_LOCATION));
 
 ?>
---EXPECT--
-string(3) "GMT"
+--EXPECTF--
+string(%d) "%r(GMT|GMT\+0)%r"
 string(30) "Western European Standard Time"
 string(13) "Portugal Time"
 string(21) "Western European Time"
 string(5) "+0000"
-string(3) "GMT"
-string(3) "GMT"
+string(%d) "%r(GMT|GMT\+00:00)%r"
+string(%d) "%r(GMT|GMT\+0)%r"
 string(13) "Portugal Time"
diff -Nru php8.2-8.2.29/ext/json/json_parser.tab.c php8.2-8.2.30/ext/json/json_parser.tab.c
--- php8.2-8.2.29/ext/json/json_parser.tab.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/json/json_parser.tab.c	2025-12-16 17:18:12.000000000 +0000
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.8.2.  */
+/* A Bison parser, made by GNU Bison 3.7.5.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -46,10 +46,10 @@
    USER NAME SPACE" below.  */
 
 /* Identify Bison output, and Bison version.  */
-#define YYBISON 30802
+#define YYBISON 30705
 
 /* Bison version string.  */
-#define YYBISON_VERSION "3.8.2"
+#define YYBISON_VERSION "3.7.5"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -338,18 +338,12 @@
 # define YY_USE(E) /* empty */
 #endif
 
+#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__
-# if __GNUC__ * 100 + __GNUC_MINOR__ < 407
-#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
-    _Pragma ("GCC diagnostic push")                                     \
-    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")
-# else
-#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                            \
     _Pragma ("GCC diagnostic push")                                     \
     _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")              \
     _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# endif
 # define YY_IGNORE_MAYBE_UNINITIALIZED_END      \
     _Pragma ("GCC diagnostic pop")
 #else
@@ -564,7 +558,7 @@
 };
 
 #if PHP_JSON_YYDEBUG
-/* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
        0,    79,    79,    90,    89,   107,   108,   116,   124,   128,
@@ -601,6 +595,16 @@
 }
 #endif
 
+#ifdef YYPRINT
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
+static const yytype_int16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   123,   125,    93,    58,    44,    91
+};
+#endif
+
 #define YYPACT_NINF (-16)
 
 #define yypact_value_is_default(Yyn) \
@@ -611,8 +615,8 @@
 #define yytable_value_is_error(Yyn) \
   0
 
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
 static const yytype_int8 yypact[] =
 {
       -1,   -16,   -16,   -16,   -16,   -16,   -16,   -16,   -16,   -16,
@@ -621,9 +625,9 @@
       -1,   -16,   -16,   -16,    -1,    10,   -16,   -16,    -1,   -16
 };
 
-/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
-   Performed when YYTABLE does not specify something else to do.  Zero
-   means the default is an error.  */
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
 static const yytype_int8 yydefact[] =
 {
        0,    27,    28,    29,    25,    26,    23,    24,     3,    11,
@@ -632,23 +636,23 @@
        0,    14,    13,    12,     0,     0,     9,    18,     0,    10
 };
 
-/* YYPGOTO[NTERM-NUM].  */
+  /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
      -16,   -16,   -16,   -16,   -16,   -16,   -16,   -16,   -16,   -16,
      -16,   -16,    -3,   -15
 };
 
-/* YYDEFGOTO[NTERM-NUM].  */
+  /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int8 yydefgoto[] =
 {
        0,    10,    11,    14,    28,    20,    21,    12,    15,    33,
       23,    24,    22,    13
 };
 
-/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule whose
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int8 yytable[] =
 {
       25,    17,     1,     2,     3,     4,     5,     6,     7,    18,
@@ -663,8 +667,8 @@
       -1,    16,    15,    38,    16,    15,    29
 };
 
-/* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of
-   state STATE-NUM.  */
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
 static const yytype_int8 yystos[] =
 {
        0,     3,     4,     5,     6,     7,     8,     9,    12,    17,
@@ -673,7 +677,7 @@
       15,    13,    14,    27,    16,    30,    31,    31,    15,    31
 };
 
-/* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM.  */
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_int8 yyr1[] =
 {
        0,    18,    19,    21,    20,    22,    22,    23,    23,    24,
@@ -681,7 +685,7 @@
       30,    31,    31,    31,    31,    31,    31,    31,    31,    31
 };
 
-/* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM.  */
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
 static const yytype_int8 yyr2[] =
 {
        0,     2,     2,     0,     4,     1,     1,     0,     1,     3,
@@ -698,7 +702,6 @@
 #define YYACCEPT        goto yyacceptlab
 #define YYABORT         goto yyabortlab
 #define YYERROR         goto yyerrorlab
-#define YYNOMEM         goto yyexhaustedlab
 
 
 #define YYRECOVERING()  (!!yyerrstatus)
@@ -739,7 +742,10 @@
     YYFPRINTF Args;                             \
 } while (0)
 
-
+/* This macro is provided for backward compatibility. */
+# ifndef YY_LOCATION_PRINT
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 
 
 # define YY_SYMBOL_PRINT(Title, Kind, Value, Location)                    \
@@ -767,6 +773,10 @@
   YY_USE (parser);
   if (!yyvaluep)
     return;
+# ifdef YYPRINT
+  if (yykind < YYNTOKENS)
+    YYPRINT (yyo, yytoknum[yykind], *yyvaluep);
+# endif
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   YY_USE (yykind);
   YY_IGNORE_MAYBE_UNINITIALIZED_END
@@ -1026,7 +1036,6 @@
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yychar = PHP_JSON_YYEMPTY; /* Cause a token to be read.  */
-
   goto yysetstate;
 
 
@@ -1052,7 +1061,7 @@
 
   if (yyss + yystacksize - 1 <= yyssp)
 #if !defined yyoverflow && !defined YYSTACK_RELOCATE
-    YYNOMEM;
+    goto yyexhaustedlab;
 #else
     {
       /* Get the current used size of the three stacks, in elements.  */
@@ -1080,7 +1089,7 @@
 # else /* defined YYSTACK_RELOCATE */
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-        YYNOMEM;
+        goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
         yystacksize = YYMAXDEPTH;
@@ -1091,7 +1100,7 @@
           YY_CAST (union yyalloc *,
                    YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize))));
         if (! yyptr)
-          YYNOMEM;
+          goto yyexhaustedlab;
         YYSTACK_RELOCATE (yyss_alloc, yyss);
         YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
@@ -1113,7 +1122,6 @@
     }
 #endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
 
-
   if (yystate == YYFINAL)
     YYACCEPT;
 
@@ -1420,7 +1428,6 @@
      label yyerrorlab therefore never appears in user code.  */
   if (0)
     YYERROR;
-  ++yynerrs;
 
   /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
@@ -1481,7 +1488,7 @@
 `-------------------------------------*/
 yyacceptlab:
   yyresult = 0;
-  goto yyreturnlab;
+  goto yyreturn;
 
 
 /*-----------------------------------.
@@ -1489,22 +1496,24 @@
 `-----------------------------------*/
 yyabortlab:
   yyresult = 1;
-  goto yyreturnlab;
+  goto yyreturn;
 
 
-/*-----------------------------------------------------------.
-| yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here.  |
-`-----------------------------------------------------------*/
+#if !defined yyoverflow
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
 yyexhaustedlab:
   yyerror (parser, YY_("memory exhausted"));
   yyresult = 2;
-  goto yyreturnlab;
+  goto yyreturn;
+#endif
 
 
-/*----------------------------------------------------------.
-| yyreturnlab -- parsing is finished, clean up and return.  |
-`----------------------------------------------------------*/
-yyreturnlab:
+/*-------------------------------------------------------.
+| yyreturn -- parsing is finished, clean up and return.  |
+`-------------------------------------------------------*/
+yyreturn:
   if (yychar != PHP_JSON_YYEMPTY)
     {
       /* Make sure we have latest lookahead translation.  See comments at
diff -Nru php8.2-8.2.29/ext/json/json_parser.tab.h php8.2-8.2.30/ext/json/json_parser.tab.h
--- php8.2-8.2.29/ext/json/json_parser.tab.h	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/json/json_parser.tab.h	2025-12-16 17:18:12.000000000 +0000
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.8.2.  */
+/* A Bison parser, made by GNU Bison 3.7.5.  */
 
 /* Bison interface for Yacc-like parsers in C
 
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -91,8 +91,6 @@
 
 
 
-
 int php_json_yyparse (php_json_parser *parser);
 
-
 #endif /* !YY_PHP_JSON_YY_EXT_JSON_JSON_PARSER_TAB_H_INCLUDED  */
diff -Nru php8.2-8.2.29/ext/json/json_scanner.c php8.2-8.2.30/ext/json/json_scanner.c
--- php8.2-8.2.29/ext/json/json_scanner.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/json/json_scanner.c	2025-12-16 17:18:12.000000000 +0000
@@ -1,4 +1,4 @@
-/* Generated by re2c 4.0 */
+/* Generated by re2c 2.0.3 */
 /*
   +----------------------------------------------------------------------+
   | Copyright (c) The PHP Group                                          |
@@ -111,137 +111,144 @@
 	{
 		YYCTYPE yych;
 		unsigned int yyaccept = 0;
-		static const unsigned char yybm_JS[256] = {
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,  64,   0,   0,   0,  64,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			 64,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			128, 128, 128, 128, 128, 128, 128, 128,
-			128, 128,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0,
-			  0,   0,   0,   0,   0,   0,   0,   0
-		};
 		if (YYGETCONDITION() < 2) {
-			if (YYGETCONDITION() < 1) goto yyc_JS;
-			else goto yyc_STR_P1;
+			if (YYGETCONDITION() < 1) {
+				goto yyc_JS;
+			} else {
+				goto yyc_STR_P1;
+			}
 		} else {
-			if (YYGETCONDITION() < 3) goto yyc_STR_P2_BIN;
-			else goto yyc_STR_P2_UTF;
+			if (YYGETCONDITION() < 3) {
+				goto yyc_STR_P2_BIN;
+			} else {
+				goto yyc_STR_P2_UTF;
+			}
 		}
 /* *********************************** */
 yyc_JS:
-		yych = *YYCURSOR;
-		if (yych <= ']') {
-			if (yych <= '"') {
-				if (yych <= '\f') {
-					if (yych <= 0x08) {
-						if (yych >= 0x01) goto yy1;
-					} else {
-						if (yych <= '\t') goto yy2;
-						if (yych <= '\n') goto yy5;
-						goto yy1;
-					}
-				} else {
-					if (yych <= 0x1F) {
-						if (yych <= '\r') goto yy6;
-						goto yy1;
-					} else {
-						if (yych <= ' ') goto yy2;
-						if (yych <= '!') goto yy7;
-						goto yy9;
-					}
-				}
-			} else {
-				if (yych <= '0') {
-					if (yych <= ',') {
-						if (yych <= '+') goto yy7;
-						goto yy10;
-					} else {
-						if (yych <= '-') goto yy11;
-						if (yych <= '/') goto yy7;
-						goto yy12;
-					}
-				} else {
-					if (yych <= 'Z') {
-						if (yych <= '9') goto yy14;
-						if (yych <= ':') goto yy15;
-						goto yy7;
-					} else {
-						if (yych <= '[') goto yy16;
-						if (yych <= '\\') goto yy7;
-						goto yy17;
-					}
-				}
-			}
-		} else {
-			if (yych <= '}') {
-				if (yych <= 's') {
-					if (yych <= 'f') {
-						if (yych <= 'e') goto yy7;
-						goto yy18;
+		{
+			static const unsigned char yybm[] = {
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,  64,   0,   0,   0,  64,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				 64,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				128, 128, 128, 128, 128, 128, 128, 128, 
+				128, 128,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+				  0,   0,   0,   0,   0,   0,   0,   0, 
+			};
+			yych = *YYCURSOR;
+			if (yych <= ']') {
+				if (yych <= '"') {
+					if (yych <= '\f') {
+						if (yych <= 0x08) {
+							if (yych >= 0x01) goto yy4;
+						} else {
+							if (yych <= '\t') goto yy6;
+							if (yych <= '\n') goto yy9;
+							goto yy4;
+						}
 					} else {
-						if (yych == 'n') goto yy19;
-						goto yy7;
+						if (yych <= 0x1F) {
+							if (yych <= '\r') goto yy10;
+							goto yy4;
+						} else {
+							if (yych <= ' ') goto yy6;
+							if (yych <= '!') goto yy11;
+							goto yy13;
+						}
 					}
 				} else {
-					if (yych <= 'z') {
-						if (yych <= 't') goto yy20;
-						goto yy7;
+					if (yych <= '0') {
+						if (yych <= ',') {
+							if (yych <= '+') goto yy11;
+							goto yy15;
+						} else {
+							if (yych <= '-') goto yy17;
+							if (yych <= '/') goto yy11;
+							goto yy18;
+						}
 					} else {
-						if (yych <= '{') goto yy21;
-						if (yych <= '|') goto yy7;
-						goto yy22;
+						if (yych <= 'Z') {
+							if (yych <= '9') goto yy20;
+							if (yych <= ':') goto yy22;
+							goto yy11;
+						} else {
+							if (yych <= '[') goto yy24;
+							if (yych <= '\\') goto yy11;
+							goto yy26;
+						}
 					}
 				}
 			} else {
-				if (yych <= 0xEC) {
-					if (yych <= 0xC1) {
-						if (yych <= 0x7F) goto yy7;
-						goto yy23;
+				if (yych <= '}') {
+					if (yych <= 's') {
+						if (yych <= 'f') {
+							if (yych <= 'e') goto yy11;
+							goto yy28;
+						} else {
+							if (yych == 'n') goto yy29;
+							goto yy11;
+						}
 					} else {
-						if (yych <= 0xDF) goto yy25;
-						if (yych <= 0xE0) goto yy26;
-						goto yy27;
+						if (yych <= 'z') {
+							if (yych <= 't') goto yy30;
+							goto yy11;
+						} else {
+							if (yych <= '{') goto yy31;
+							if (yych <= '|') goto yy11;
+							goto yy33;
+						}
 					}
 				} else {
-					if (yych <= 0xF0) {
-						if (yych <= 0xED) goto yy28;
-						if (yych <= 0xEF) goto yy27;
-						goto yy29;
+					if (yych <= 0xEC) {
+						if (yych <= 0xC1) {
+							if (yych <= 0x7F) goto yy11;
+							goto yy35;
+						} else {
+							if (yych <= 0xDF) goto yy37;
+							if (yych <= 0xE0) goto yy38;
+							goto yy39;
+						}
 					} else {
-						if (yych <= 0xF3) goto yy30;
-						if (yych <= 0xF4) goto yy31;
-						goto yy23;
+						if (yych <= 0xF0) {
+							if (yych <= 0xED) goto yy40;
+							if (yych <= 0xEF) goto yy39;
+							goto yy41;
+						} else {
+							if (yych <= 0xF3) goto yy42;
+							if (yych <= 0xF4) goto yy43;
+							goto yy35;
+						}
 					}
 				}
 			}
-		}
-		++YYCURSOR;
-		{
+			++YYCURSOR;
+			{
 		if (s->limit < s->cursor) {
 			return PHP_JSON_T_EOI;
 		} else {
@@ -249,61 +256,63 @@
 			return PHP_JSON_T_ERROR;
 		}
 	}
-yy1:
-		++YYCURSOR;
-		{
+yy4:
+			++YYCURSOR;
+			{
 		s->errcode = PHP_JSON_ERROR_CTRL_CHAR;
 		return PHP_JSON_T_ERROR;
 	}
-yy2:
-		yych = *++YYCURSOR;
-yy3:
-		if (yybm_JS[0+yych] & 64) goto yy2;
-yy4:
-		{ goto std; }
-yy5:
-		++YYCURSOR;
-		goto yy4;
 yy6:
-		yych = *++YYCURSOR;
-		if (yych == '\n') goto yy5;
-		goto yy3;
+			yych = *++YYCURSOR;
 yy7:
-		++YYCURSOR;
+			if (yybm[0+yych] & 64) {
+				goto yy6;
+			}
 yy8:
-		{
+			{ goto std; }
+yy9:
+			++YYCURSOR;
+			goto yy8;
+yy10:
+			yych = *++YYCURSOR;
+			if (yych == '\n') goto yy9;
+			goto yy7;
+yy11:
+			++YYCURSOR;
+yy12:
+			{
 		s->errcode = PHP_JSON_ERROR_SYNTAX;
 		return PHP_JSON_T_ERROR;
 	}
-yy9:
-		++YYCURSOR;
-		{
+yy13:
+			++YYCURSOR;
+			{
 		s->str_start = s->cursor;
 		s->str_esc = 0;
 		s->utf8_invalid = 0;
 		s->utf8_invalid_count = 0;
 		PHP_JSON_CONDITION_SET_AND_GOTO(STR_P1);
 	}
-yy10:
-		++YYCURSOR;
-		{ return ','; }
-yy11:
-		yych = *++YYCURSOR;
-		if (yych <= '/') goto yy8;
-		if (yych <= '0') goto yy12;
-		if (yych <= '9') goto yy14;
-		goto yy8;
-yy12:
-		yyaccept = 0;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 'D') {
-			if (yych == '.') goto yy32;
-		} else {
-			if (yych <= 'E') goto yy34;
-			if (yych == 'e') goto yy34;
-		}
-yy13:
-		{
+yy15:
+			++YYCURSOR;
+			{ return ','; }
+yy17:
+			yych = *++YYCURSOR;
+			if (yych <= '/') goto yy12;
+			if (yych <= '0') goto yy18;
+			if (yych <= '9') goto yy20;
+			goto yy12;
+yy18:
+			yyaccept = 0;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yych <= 'D') {
+				if (yych == '.') goto yy44;
+			} else {
+				if (yych <= 'E') goto yy46;
+				if (yych == 'e') goto yy46;
+			}
+yy19:
+			{
 		bool bigint = 0, negative = s->token[0] == '-';
 		size_t digits = (size_t) (s->cursor - s->token - negative);
 		if (digits >= PHP_JSON_INT_MAX_LENGTH) {
@@ -327,236 +336,245 @@
 			return PHP_JSON_T_DOUBLE;
 		}
 	}
-yy14:
-		yyaccept = 0;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yybm_JS[0+yych] & 128) goto yy14;
-		if (yych <= 'D') {
-			if (yych == '.') goto yy32;
-			goto yy13;
-		} else {
-			if (yych <= 'E') goto yy34;
-			if (yych == 'e') goto yy34;
-			goto yy13;
-		}
-yy15:
-		++YYCURSOR;
-		{ return ':'; }
-yy16:
-		++YYCURSOR;
-		{ return '['; }
-yy17:
-		++YYCURSOR;
-		{ return ']'; }
-yy18:
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'a') goto yy35;
-		goto yy8;
-yy19:
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'u') goto yy36;
-		goto yy8;
 yy20:
-		yyaccept = 1;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'r') goto yy37;
-		goto yy8;
-yy21:
-		++YYCURSOR;
-		{ return '{'; }
+			yyaccept = 0;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yybm[0+yych] & 128) {
+				goto yy20;
+			}
+			if (yych <= 'D') {
+				if (yych == '.') goto yy44;
+				goto yy19;
+			} else {
+				if (yych <= 'E') goto yy46;
+				if (yych == 'e') goto yy46;
+				goto yy19;
+			}
 yy22:
-		++YYCURSOR;
-		{ return '}'; }
-yy23:
-		++YYCURSOR;
+			++YYCURSOR;
+			{ return ':'; }
 yy24:
-		{
-		s->errcode = PHP_JSON_ERROR_UTF8;
-		return PHP_JSON_T_ERROR;
-	}
-yy25:
-		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy24;
-		if (yych <= 0xBF) goto yy7;
-		goto yy24;
+			++YYCURSOR;
+			{ return '['; }
 yy26:
-		yyaccept = 2;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x9F) goto yy24;
-		if (yych <= 0xBF) goto yy38;
-		goto yy24;
-yy27:
-		yyaccept = 2;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy24;
-		if (yych <= 0xBF) goto yy38;
-		goto yy24;
+			++YYCURSOR;
+			{ return ']'; }
 yy28:
-		yyaccept = 2;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy24;
-		if (yych <= 0x9F) goto yy38;
-		goto yy24;
+			yyaccept = 1;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yych == 'a') goto yy47;
+			goto yy12;
 yy29:
-		yyaccept = 2;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x8F) goto yy24;
-		if (yych <= 0xBF) goto yy39;
-		goto yy24;
+			yyaccept = 1;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yych == 'u') goto yy48;
+			goto yy12;
 yy30:
-		yyaccept = 2;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy24;
-		if (yych <= 0xBF) goto yy39;
-		goto yy24;
+			yyaccept = 1;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yych == 'r') goto yy49;
+			goto yy12;
 yy31:
-		yyaccept = 2;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy24;
-		if (yych <= 0x8F) goto yy39;
-		goto yy24;
-yy32:
-		yych = *++YYCURSOR;
-		if (yych <= '/') goto yy33;
-		if (yych <= '9') goto yy40;
+			++YYCURSOR;
+			{ return '{'; }
 yy33:
-		YYCURSOR = YYMARKER;
-		if (yyaccept <= 1) {
-			if (yyaccept == 0) goto yy13;
-			else goto yy8;
-		} else {
-			if (yyaccept == 2) goto yy24;
-			else goto yy41;
-		}
-yy34:
-		yych = *++YYCURSOR;
-		if (yych <= ',') {
-			if (yych == '+') goto yy42;
-			goto yy33;
-		} else {
-			if (yych <= '-') goto yy42;
-			if (yych <= '/') goto yy33;
-			if (yych <= '9') goto yy43;
-			goto yy33;
-		}
+			++YYCURSOR;
+			{ return '}'; }
 yy35:
-		yych = *++YYCURSOR;
-		if (yych == 'l') goto yy44;
-		goto yy33;
+			++YYCURSOR;
 yy36:
-		yych = *++YYCURSOR;
-		if (yych == 'l') goto yy45;
-		goto yy33;
+			{
+		s->errcode = PHP_JSON_ERROR_UTF8;
+		return PHP_JSON_T_ERROR;
+	}
 yy37:
-		yych = *++YYCURSOR;
-		if (yych == 'u') goto yy46;
-		goto yy33;
+			yych = *++YYCURSOR;
+			if (yych <= 0x7F) goto yy36;
+			if (yych <= 0xBF) goto yy11;
+			goto yy36;
 yy38:
-		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy33;
-		if (yych <= 0xBF) goto yy7;
-		goto yy33;
+			yyaccept = 2;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yych <= 0x9F) goto yy36;
+			if (yych <= 0xBF) goto yy50;
+			goto yy36;
 yy39:
-		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy33;
-		if (yych <= 0xBF) goto yy38;
-		goto yy33;
+			yyaccept = 2;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yych <= 0x7F) goto yy36;
+			if (yych <= 0xBF) goto yy50;
+			goto yy36;
 yy40:
-		yyaccept = 3;
-		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 'D') {
-			if (yych <= '/') goto yy41;
-			if (yych <= '9') goto yy40;
-		} else {
-			if (yych <= 'E') goto yy34;
-			if (yych == 'e') goto yy34;
-		}
+			yyaccept = 2;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yych <= 0x7F) goto yy36;
+			if (yych <= 0x9F) goto yy50;
+			goto yy36;
 yy41:
-		{
-		ZVAL_DOUBLE(&s->value, zend_strtod((char *) s->token, NULL));
-		return PHP_JSON_T_DOUBLE;
-	}
+			yyaccept = 2;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yych <= 0x8F) goto yy36;
+			if (yych <= 0xBF) goto yy51;
+			goto yy36;
 yy42:
-		yych = *++YYCURSOR;
-		if (yych <= '/') goto yy33;
-		if (yych >= ':') goto yy33;
+			yyaccept = 2;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yych <= 0x7F) goto yy36;
+			if (yych <= 0xBF) goto yy51;
+			goto yy36;
 yy43:
-		yych = *++YYCURSOR;
-		if (yych <= '/') goto yy41;
-		if (yych <= '9') goto yy43;
-		goto yy41;
+			yyaccept = 2;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yych <= 0x7F) goto yy36;
+			if (yych <= 0x8F) goto yy51;
+			goto yy36;
 yy44:
-		yych = *++YYCURSOR;
-		if (yych == 's') goto yy47;
-		goto yy33;
+			yych = *++YYCURSOR;
+			if (yych <= '/') goto yy45;
+			if (yych <= '9') goto yy52;
 yy45:
-		yych = *++YYCURSOR;
-		if (yych == 'l') goto yy48;
-		goto yy33;
+			YYCURSOR = YYMARKER;
+			if (yyaccept <= 1) {
+				if (yyaccept == 0) {
+					goto yy19;
+				} else {
+					goto yy12;
+				}
+			} else {
+				if (yyaccept == 2) {
+					goto yy36;
+				} else {
+					goto yy54;
+				}
+			}
 yy46:
-		yych = *++YYCURSOR;
-		if (yych == 'e') goto yy49;
-		goto yy33;
+			yych = *++YYCURSOR;
+			if (yych <= ',') {
+				if (yych == '+') goto yy55;
+				goto yy45;
+			} else {
+				if (yych <= '-') goto yy55;
+				if (yych <= '/') goto yy45;
+				if (yych <= '9') goto yy56;
+				goto yy45;
+			}
 yy47:
-		yych = *++YYCURSOR;
-		if (yych == 'e') goto yy50;
-		goto yy33;
+			yych = *++YYCURSOR;
+			if (yych == 'l') goto yy58;
+			goto yy45;
 yy48:
-		++YYCURSOR;
-		{
+			yych = *++YYCURSOR;
+			if (yych == 'l') goto yy59;
+			goto yy45;
+yy49:
+			yych = *++YYCURSOR;
+			if (yych == 'u') goto yy60;
+			goto yy45;
+yy50:
+			yych = *++YYCURSOR;
+			if (yych <= 0x7F) goto yy45;
+			if (yych <= 0xBF) goto yy11;
+			goto yy45;
+yy51:
+			yych = *++YYCURSOR;
+			if (yych <= 0x7F) goto yy45;
+			if (yych <= 0xBF) goto yy50;
+			goto yy45;
+yy52:
+			yyaccept = 3;
+			yych = *(YYMARKER = ++YYCURSOR);
+			if (yych <= 'D') {
+				if (yych <= '/') goto yy54;
+				if (yych <= '9') goto yy52;
+			} else {
+				if (yych <= 'E') goto yy46;
+				if (yych == 'e') goto yy46;
+			}
+yy54:
+			{
+		ZVAL_DOUBLE(&s->value, zend_strtod((char *) s->token, NULL));
+		return PHP_JSON_T_DOUBLE;
+	}
+yy55:
+			yych = *++YYCURSOR;
+			if (yych <= '/') goto yy45;
+			if (yych >= ':') goto yy45;
+yy56:
+			yych = *++YYCURSOR;
+			if (yych <= '/') goto yy54;
+			if (yych <= '9') goto yy56;
+			goto yy54;
+yy58:
+			yych = *++YYCURSOR;
+			if (yych == 's') goto yy61;
+			goto yy45;
+yy59:
+			yych = *++YYCURSOR;
+			if (yych == 'l') goto yy62;
+			goto yy45;
+yy60:
+			yych = *++YYCURSOR;
+			if (yych == 'e') goto yy64;
+			goto yy45;
+yy61:
+			yych = *++YYCURSOR;
+			if (yych == 'e') goto yy66;
+			goto yy45;
+yy62:
+			++YYCURSOR;
+			{
 		ZVAL_NULL(&s->value);
 		return PHP_JSON_T_NUL;
 	}
-yy49:
-		++YYCURSOR;
-		{
+yy64:
+			++YYCURSOR;
+			{
 		ZVAL_TRUE(&s->value);
 		return PHP_JSON_T_TRUE;
 	}
-yy50:
-		++YYCURSOR;
-		{
+yy66:
+			++YYCURSOR;
+			{
 		ZVAL_FALSE(&s->value);
 		return PHP_JSON_T_FALSE;
 	}
+		}
 /* *********************************** */
 yyc_STR_P1:
 		yych = *YYCURSOR;
 		if (yych <= 0xDF) {
 			if (yych <= '[') {
-				if (yych <= 0x1F) goto yy52;
-				if (yych == '"') goto yy54;
-				goto yy53;
-			} else {
-				if (yych <= '\\') goto yy55;
-				if (yych <= 0x7F) goto yy53;
-				if (yych <= 0xC1) goto yy57;
-				goto yy59;
+				if (yych <= 0x1F) goto yy70;
+				if (yych == '"') goto yy74;
+				goto yy72;
+			} else {
+				if (yych <= '\\') goto yy76;
+				if (yych <= 0x7F) goto yy72;
+				if (yych <= 0xC1) goto yy78;
+				goto yy80;
 			}
 		} else {
 			if (yych <= 0xEF) {
-				if (yych <= 0xE0) goto yy60;
-				if (yych == 0xED) goto yy62;
-				goto yy61;
-			} else {
-				if (yych <= 0xF0) goto yy63;
-				if (yych <= 0xF3) goto yy64;
-				if (yych <= 0xF4) goto yy65;
-				goto yy57;
+				if (yych <= 0xE0) goto yy81;
+				if (yych == 0xED) goto yy83;
+				goto yy82;
+			} else {
+				if (yych <= 0xF0) goto yy84;
+				if (yych <= 0xF3) goto yy85;
+				if (yych <= 0xF4) goto yy86;
+				goto yy78;
 			}
 		}
-yy52:
+yy70:
 		++YYCURSOR;
 		{
 		s->errcode = PHP_JSON_ERROR_CTRL_CHAR;
 		return PHP_JSON_T_ERROR;
 	}
-yy53:
+yy72:
 		++YYCURSOR;
 		{ PHP_JSON_CONDITION_GOTO(STR_P1); }
-yy54:
+yy74:
 		++YYCURSOR;
 		{
 		zend_string *str;
@@ -579,41 +597,41 @@
 			return PHP_JSON_T_STRING;
 		}
 	}
-yy55:
+yy76:
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
 		if (yych <= 'e') {
 			if (yych <= '/') {
-				if (yych == '"') goto yy66;
-				if (yych >= '/') goto yy66;
+				if (yych == '"') goto yy87;
+				if (yych >= '/') goto yy87;
 			} else {
 				if (yych <= '\\') {
-					if (yych >= '\\') goto yy66;
+					if (yych >= '\\') goto yy87;
 				} else {
-					if (yych == 'b') goto yy66;
+					if (yych == 'b') goto yy87;
 				}
 			}
 		} else {
 			if (yych <= 'q') {
-				if (yych <= 'f') goto yy66;
-				if (yych == 'n') goto yy66;
+				if (yych <= 'f') goto yy87;
+				if (yych == 'n') goto yy87;
 			} else {
 				if (yych <= 's') {
-					if (yych <= 'r') goto yy66;
+					if (yych <= 'r') goto yy87;
 				} else {
-					if (yych <= 't') goto yy66;
-					if (yych <= 'u') goto yy67;
+					if (yych <= 't') goto yy87;
+					if (yych <= 'u') goto yy89;
 				}
 			}
 		}
-yy56:
+yy77:
 		{
 		s->errcode = PHP_JSON_ERROR_SYNTAX;
 		return PHP_JSON_T_ERROR;
 	}
-yy57:
+yy78:
 		++YYCURSOR;
-yy58:
+yy79:
 		{
 		if (s->options & (PHP_JSON_INVALID_UTF8_IGNORE | PHP_JSON_INVALID_UTF8_SUBSTITUTE)) {
 			if (s->options & PHP_JSON_INVALID_UTF8_SUBSTITUTE) {
@@ -631,326 +649,329 @@
 		s->errcode = PHP_JSON_ERROR_UTF8;
 		return PHP_JSON_T_ERROR;
 	}
-yy59:
+yy80:
 		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy58;
-		if (yych <= 0xBF) goto yy53;
-		goto yy58;
-yy60:
+		if (yych <= 0x7F) goto yy79;
+		if (yych <= 0xBF) goto yy72;
+		goto yy79;
+yy81:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x9F) goto yy58;
-		if (yych <= 0xBF) goto yy69;
-		goto yy58;
-yy61:
+		if (yych <= 0x9F) goto yy79;
+		if (yych <= 0xBF) goto yy91;
+		goto yy79;
+yy82:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy58;
-		if (yych <= 0xBF) goto yy69;
-		goto yy58;
-yy62:
+		if (yych <= 0x7F) goto yy79;
+		if (yych <= 0xBF) goto yy91;
+		goto yy79;
+yy83:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy58;
-		if (yych <= 0x9F) goto yy69;
-		goto yy58;
-yy63:
+		if (yych <= 0x7F) goto yy79;
+		if (yych <= 0x9F) goto yy91;
+		goto yy79;
+yy84:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x8F) goto yy58;
-		if (yych <= 0xBF) goto yy70;
-		goto yy58;
-yy64:
+		if (yych <= 0x8F) goto yy79;
+		if (yych <= 0xBF) goto yy92;
+		goto yy79;
+yy85:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy58;
-		if (yych <= 0xBF) goto yy70;
-		goto yy58;
-yy65:
+		if (yych <= 0x7F) goto yy79;
+		if (yych <= 0xBF) goto yy92;
+		goto yy79;
+yy86:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy58;
-		if (yych <= 0x8F) goto yy70;
-		goto yy58;
-yy66:
+		if (yych <= 0x7F) goto yy79;
+		if (yych <= 0x8F) goto yy92;
+		goto yy79;
+yy87:
 		++YYCURSOR;
 		{
 		s->str_esc++;
 		PHP_JSON_CONDITION_GOTO(STR_P1);
 	}
-yy67:
+yy89:
 		yych = *++YYCURSOR;
 		if (yych <= 'D') {
 			if (yych <= '9') {
-				if (yych <= '/') goto yy68;
-				if (yych <= '0') goto yy71;
-				goto yy72;
-			} else {
-				if (yych <= '@') goto yy68;
-				if (yych <= 'C') goto yy72;
-				goto yy73;
+				if (yych <= '/') goto yy90;
+				if (yych <= '0') goto yy93;
+				goto yy94;
+			} else {
+				if (yych <= '@') goto yy90;
+				if (yych <= 'C') goto yy94;
+				goto yy95;
 			}
 		} else {
 			if (yych <= 'c') {
-				if (yych <= 'F') goto yy72;
-				if (yych >= 'a') goto yy72;
+				if (yych <= 'F') goto yy94;
+				if (yych >= 'a') goto yy94;
 			} else {
-				if (yych <= 'd') goto yy73;
-				if (yych <= 'f') goto yy72;
+				if (yych <= 'd') goto yy95;
+				if (yych <= 'f') goto yy94;
 			}
 		}
-yy68:
+yy90:
 		YYCURSOR = YYMARKER;
 		if (yyaccept <= 1) {
-			if (yyaccept == 0) goto yy56;
-			else goto yy58;
+			if (yyaccept == 0) {
+				goto yy77;
+			} else {
+				goto yy79;
+			}
 		} else {
-			goto yy88;
+			goto yy113;
 		}
-yy69:
+yy91:
 		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy68;
-		if (yych <= 0xBF) goto yy53;
-		goto yy68;
-yy70:
+		if (yych <= 0x7F) goto yy90;
+		if (yych <= 0xBF) goto yy72;
+		goto yy90;
+yy92:
 		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy68;
-		if (yych <= 0xBF) goto yy69;
-		goto yy68;
-yy71:
+		if (yych <= 0x7F) goto yy90;
+		if (yych <= 0xBF) goto yy91;
+		goto yy90;
+yy93:
 		yych = *++YYCURSOR;
 		if (yych <= '9') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '0') goto yy74;
-			if (yych <= '7') goto yy75;
-			goto yy76;
+			if (yych <= '/') goto yy90;
+			if (yych <= '0') goto yy96;
+			if (yych <= '7') goto yy97;
+			goto yy98;
 		} else {
 			if (yych <= 'F') {
-				if (yych <= '@') goto yy68;
-				goto yy76;
+				if (yych <= '@') goto yy90;
+				goto yy98;
 			} else {
-				if (yych <= '`') goto yy68;
-				if (yych <= 'f') goto yy76;
-				goto yy68;
+				if (yych <= '`') goto yy90;
+				if (yych <= 'f') goto yy98;
+				goto yy90;
 			}
 		}
-yy72:
+yy94:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '9') goto yy76;
-			goto yy68;
-		} else {
-			if (yych <= 'F') goto yy76;
-			if (yych <= '`') goto yy68;
-			if (yych <= 'f') goto yy76;
-			goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych <= '9') goto yy98;
+			goto yy90;
+		} else {
+			if (yych <= 'F') goto yy98;
+			if (yych <= '`') goto yy90;
+			if (yych <= 'f') goto yy98;
+			goto yy90;
 		}
-yy73:
+yy95:
 		yych = *++YYCURSOR;
 		if (yych <= 'B') {
 			if (yych <= '7') {
-				if (yych <= '/') goto yy68;
-				goto yy76;
+				if (yych <= '/') goto yy90;
+				goto yy98;
 			} else {
-				if (yych <= '9') goto yy77;
-				if (yych <= '@') goto yy68;
-				goto yy77;
+				if (yych <= '9') goto yy99;
+				if (yych <= '@') goto yy90;
+				goto yy99;
 			}
 		} else {
 			if (yych <= '`') {
-				if (yych <= 'F') goto yy78;
-				goto yy68;
+				if (yych <= 'F') goto yy100;
+				goto yy90;
 			} else {
-				if (yych <= 'b') goto yy77;
-				if (yych <= 'f') goto yy78;
-				goto yy68;
+				if (yych <= 'b') goto yy99;
+				if (yych <= 'f') goto yy100;
+				goto yy90;
 			}
 		}
-yy74:
+yy96:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '7') goto yy79;
-			if (yych <= '9') goto yy80;
-			goto yy68;
-		} else {
-			if (yych <= 'F') goto yy80;
-			if (yych <= '`') goto yy68;
-			if (yych <= 'f') goto yy80;
-			goto yy68;
-		}
-yy75:
-		yych = *++YYCURSOR;
-		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '9') goto yy80;
-			goto yy68;
-		} else {
-			if (yych <= 'F') goto yy80;
-			if (yych <= '`') goto yy68;
-			if (yych <= 'f') goto yy80;
-			goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych <= '7') goto yy101;
+			if (yych <= '9') goto yy102;
+			goto yy90;
+		} else {
+			if (yych <= 'F') goto yy102;
+			if (yych <= '`') goto yy90;
+			if (yych <= 'f') goto yy102;
+			goto yy90;
 		}
-yy76:
+yy97:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '9') goto yy81;
-			goto yy68;
-		} else {
-			if (yych <= 'F') goto yy81;
-			if (yych <= '`') goto yy68;
-			if (yych <= 'f') goto yy81;
-			goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych <= '9') goto yy102;
+			goto yy90;
+		} else {
+			if (yych <= 'F') goto yy102;
+			if (yych <= '`') goto yy90;
+			if (yych <= 'f') goto yy102;
+			goto yy90;
 		}
-yy77:
+yy98:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '9') goto yy82;
-			goto yy68;
-		} else {
-			if (yych <= 'F') goto yy82;
-			if (yych <= '`') goto yy68;
-			if (yych <= 'f') goto yy82;
-			goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych <= '9') goto yy103;
+			goto yy90;
+		} else {
+			if (yych <= 'F') goto yy103;
+			if (yych <= '`') goto yy90;
+			if (yych <= 'f') goto yy103;
+			goto yy90;
 		}
-yy78:
+yy99:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '9') goto yy83;
-			goto yy68;
-		} else {
-			if (yych <= 'F') goto yy83;
-			if (yych <= '`') goto yy68;
-			if (yych <= 'f') goto yy83;
-			goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych <= '9') goto yy104;
+			goto yy90;
+		} else {
+			if (yych <= 'F') goto yy104;
+			if (yych <= '`') goto yy90;
+			if (yych <= 'f') goto yy104;
+			goto yy90;
 		}
-yy79:
+yy100:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '9') goto yy84;
-			goto yy68;
-		} else {
-			if (yych <= 'F') goto yy84;
-			if (yych <= '`') goto yy68;
-			if (yych <= 'f') goto yy84;
-			goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych <= '9') goto yy105;
+			goto yy90;
+		} else {
+			if (yych <= 'F') goto yy105;
+			if (yych <= '`') goto yy90;
+			if (yych <= 'f') goto yy105;
+			goto yy90;
 		}
-yy80:
+yy101:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '9') goto yy85;
-			goto yy68;
-		} else {
-			if (yych <= 'F') goto yy85;
-			if (yych <= '`') goto yy68;
-			if (yych <= 'f') goto yy85;
-			goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych <= '9') goto yy106;
+			goto yy90;
+		} else {
+			if (yych <= 'F') goto yy106;
+			if (yych <= '`') goto yy90;
+			if (yych <= 'f') goto yy106;
+			goto yy90;
 		}
-yy81:
+yy102:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '9') goto yy86;
-			goto yy68;
-		} else {
-			if (yych <= 'F') goto yy86;
-			if (yych <= '`') goto yy68;
-			if (yych <= 'f') goto yy86;
-			goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych <= '9') goto yy108;
+			goto yy90;
+		} else {
+			if (yych <= 'F') goto yy108;
+			if (yych <= '`') goto yy90;
+			if (yych <= 'f') goto yy108;
+			goto yy90;
 		}
-yy82:
+yy103:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '9') goto yy87;
-			goto yy68;
-		} else {
-			if (yych <= 'F') goto yy87;
-			if (yych <= '`') goto yy68;
-			if (yych <= 'f') goto yy87;
-			goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych <= '9') goto yy110;
+			goto yy90;
+		} else {
+			if (yych <= 'F') goto yy110;
+			if (yych <= '`') goto yy90;
+			if (yych <= 'f') goto yy110;
+			goto yy90;
 		}
-yy83:
+yy104:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych <= '9') goto yy89;
-			goto yy68;
-		} else {
-			if (yych <= 'F') goto yy89;
-			if (yych <= '`') goto yy68;
-			if (yych <= 'f') goto yy89;
-			goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych <= '9') goto yy112;
+			goto yy90;
+		} else {
+			if (yych <= 'F') goto yy112;
+			if (yych <= '`') goto yy90;
+			if (yych <= 'f') goto yy112;
+			goto yy90;
 		}
-yy84:
+yy105:
+		yych = *++YYCURSOR;
+		if (yych <= '@') {
+			if (yych <= '/') goto yy90;
+			if (yych <= '9') goto yy114;
+			goto yy90;
+		} else {
+			if (yych <= 'F') goto yy114;
+			if (yych <= '`') goto yy90;
+			if (yych <= 'f') goto yy114;
+			goto yy90;
+		}
+yy106:
 		++YYCURSOR;
 		{
 		s->str_esc += 5;
 		PHP_JSON_CONDITION_GOTO(STR_P1);
 	}
-yy85:
+yy108:
 		++YYCURSOR;
 		{
 		s->str_esc += 4;
 		PHP_JSON_CONDITION_GOTO(STR_P1);
 	}
-yy86:
+yy110:
 		++YYCURSOR;
 		{
 		s->str_esc += 3;
 		PHP_JSON_CONDITION_GOTO(STR_P1);
 	}
-yy87:
+yy112:
 		yyaccept = 2;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == '\\') goto yy90;
-yy88:
+		if (yych == '\\') goto yy115;
+yy113:
 		{
 		s->errcode = PHP_JSON_ERROR_UTF16;
 		return PHP_JSON_T_ERROR;
 	}
-yy89:
+yy114:
 		++YYCURSOR;
-		goto yy88;
-yy90:
+		goto yy113;
+yy115:
 		yych = *++YYCURSOR;
-		if (yych != 'u') goto yy68;
+		if (yych != 'u') goto yy90;
 		yych = *++YYCURSOR;
-		if (yych == 'D') goto yy91;
-		if (yych != 'd') goto yy68;
-yy91:
+		if (yych == 'D') goto yy117;
+		if (yych != 'd') goto yy90;
+yy117:
 		yych = *++YYCURSOR;
-		if (yych <= 'B') goto yy68;
-		if (yych <= 'F') goto yy92;
-		if (yych <= 'b') goto yy68;
-		if (yych >= 'g') goto yy68;
-yy92:
+		if (yych <= 'B') goto yy90;
+		if (yych <= 'F') goto yy118;
+		if (yych <= 'b') goto yy90;
+		if (yych >= 'g') goto yy90;
+yy118:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych >= ':') goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych >= ':') goto yy90;
 		} else {
-			if (yych <= 'F') goto yy93;
-			if (yych <= '`') goto yy68;
-			if (yych >= 'g') goto yy68;
+			if (yych <= 'F') goto yy119;
+			if (yych <= '`') goto yy90;
+			if (yych >= 'g') goto yy90;
 		}
-yy93:
+yy119:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy68;
-			if (yych >= ':') goto yy68;
+			if (yych <= '/') goto yy90;
+			if (yych >= ':') goto yy90;
 		} else {
-			if (yych <= 'F') goto yy94;
-			if (yych <= '`') goto yy68;
-			if (yych >= 'g') goto yy68;
+			if (yych <= 'F') goto yy120;
+			if (yych <= '`') goto yy90;
+			if (yych >= 'g') goto yy90;
 		}
-yy94:
+yy120:
 		++YYCURSOR;
 		{
 		s->str_esc += 8;
@@ -961,40 +982,40 @@
 		yych = *YYCURSOR;
 		if (yych <= 0xDF) {
 			if (yych <= '[') {
-				if (yych == '"') goto yy97;
+				if (yych == '"') goto yy126;
 			} else {
-				if (yych <= '\\') goto yy98;
-				if (yych <= 0x7F) goto yy96;
-				if (yych <= 0xC1) goto yy100;
-				goto yy102;
+				if (yych <= '\\') goto yy128;
+				if (yych <= 0x7F) goto yy124;
+				if (yych <= 0xC1) goto yy130;
+				goto yy132;
 			}
 		} else {
 			if (yych <= 0xEF) {
-				if (yych <= 0xE0) goto yy103;
-				if (yych == 0xED) goto yy105;
-				goto yy104;
-			} else {
-				if (yych <= 0xF0) goto yy106;
-				if (yych <= 0xF3) goto yy107;
-				if (yych <= 0xF4) goto yy108;
-				goto yy100;
+				if (yych <= 0xE0) goto yy133;
+				if (yych == 0xED) goto yy135;
+				goto yy134;
+			} else {
+				if (yych <= 0xF0) goto yy136;
+				if (yych <= 0xF3) goto yy137;
+				if (yych <= 0xF4) goto yy138;
+				goto yy130;
 			}
 		}
-yy96:
+yy124:
 		++YYCURSOR;
 		{ PHP_JSON_CONDITION_GOTO(STR_P2_BIN); }
-yy97:
+yy126:
 		++YYCURSOR;
 		YYSETCONDITION(yycJS);
 		{
 		PHP_JSON_SCANNER_COPY_ESC();
 		return PHP_JSON_T_STRING;
 	}
-yy98:
+yy128:
 		yyaccept = 0;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'u') goto yy109;
-yy99:
+		if (yych == 'u') goto yy139;
+yy129:
 		{
 		char esc;
 		PHP_JSON_SCANNER_COPY_ESC();
@@ -1027,9 +1048,9 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy100:
+yy130:
 		++YYCURSOR;
-yy101:
+yy131:
 		{
 		if (s->utf8_invalid) {
 			PHP_JSON_SCANNER_COPY_ESC();
@@ -1042,222 +1063,225 @@
 		}
 		PHP_JSON_CONDITION_GOTO(STR_P2_BIN);
 	}
-yy102:
+yy132:
 		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy101;
-		if (yych <= 0xBF) goto yy96;
-		goto yy101;
-yy103:
+		if (yych <= 0x7F) goto yy131;
+		if (yych <= 0xBF) goto yy124;
+		goto yy131;
+yy133:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x9F) goto yy101;
-		if (yych <= 0xBF) goto yy111;
-		goto yy101;
-yy104:
+		if (yych <= 0x9F) goto yy131;
+		if (yych <= 0xBF) goto yy141;
+		goto yy131;
+yy134:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy101;
-		if (yych <= 0xBF) goto yy111;
-		goto yy101;
-yy105:
+		if (yych <= 0x7F) goto yy131;
+		if (yych <= 0xBF) goto yy141;
+		goto yy131;
+yy135:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy101;
-		if (yych <= 0x9F) goto yy111;
-		goto yy101;
-yy106:
+		if (yych <= 0x7F) goto yy131;
+		if (yych <= 0x9F) goto yy141;
+		goto yy131;
+yy136:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x8F) goto yy101;
-		if (yych <= 0xBF) goto yy112;
-		goto yy101;
-yy107:
+		if (yych <= 0x8F) goto yy131;
+		if (yych <= 0xBF) goto yy142;
+		goto yy131;
+yy137:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy101;
-		if (yych <= 0xBF) goto yy112;
-		goto yy101;
-yy108:
+		if (yych <= 0x7F) goto yy131;
+		if (yych <= 0xBF) goto yy142;
+		goto yy131;
+yy138:
 		yyaccept = 1;
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych <= 0x7F) goto yy101;
-		if (yych <= 0x8F) goto yy112;
-		goto yy101;
-yy109:
+		if (yych <= 0x7F) goto yy131;
+		if (yych <= 0x8F) goto yy142;
+		goto yy131;
+yy139:
 		yych = *++YYCURSOR;
 		if (yych <= 'D') {
 			if (yych <= '9') {
-				if (yych <= '/') goto yy110;
-				if (yych <= '0') goto yy113;
-				goto yy114;
-			} else {
-				if (yych <= '@') goto yy110;
-				if (yych <= 'C') goto yy114;
-				goto yy115;
+				if (yych <= '/') goto yy140;
+				if (yych <= '0') goto yy143;
+				goto yy144;
+			} else {
+				if (yych <= '@') goto yy140;
+				if (yych <= 'C') goto yy144;
+				goto yy145;
 			}
 		} else {
 			if (yych <= 'c') {
-				if (yych <= 'F') goto yy114;
-				if (yych >= 'a') goto yy114;
+				if (yych <= 'F') goto yy144;
+				if (yych >= 'a') goto yy144;
 			} else {
-				if (yych <= 'd') goto yy115;
-				if (yych <= 'f') goto yy114;
+				if (yych <= 'd') goto yy145;
+				if (yych <= 'f') goto yy144;
 			}
 		}
-yy110:
+yy140:
 		YYCURSOR = YYMARKER;
-		if (yyaccept == 0) goto yy99;
-		else goto yy101;
-yy111:
-		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy110;
-		if (yych <= 0xBF) goto yy96;
-		goto yy110;
-yy112:
+		if (yyaccept == 0) {
+			goto yy129;
+		} else {
+			goto yy131;
+		}
+yy141:
 		yych = *++YYCURSOR;
-		if (yych <= 0x7F) goto yy110;
-		if (yych <= 0xBF) goto yy111;
-		goto yy110;
-yy113:
+		if (yych <= 0x7F) goto yy140;
+		if (yych <= 0xBF) goto yy124;
+		goto yy140;
+yy142:
+		yych = *++YYCURSOR;
+		if (yych <= 0x7F) goto yy140;
+		if (yych <= 0xBF) goto yy141;
+		goto yy140;
+yy143:
 		yych = *++YYCURSOR;
 		if (yych <= '9') {
-			if (yych <= '/') goto yy110;
-			if (yych <= '0') goto yy116;
-			if (yych <= '7') goto yy117;
-			goto yy118;
+			if (yych <= '/') goto yy140;
+			if (yych <= '0') goto yy146;
+			if (yych <= '7') goto yy147;
+			goto yy148;
 		} else {
 			if (yych <= 'F') {
-				if (yych <= '@') goto yy110;
-				goto yy118;
+				if (yych <= '@') goto yy140;
+				goto yy148;
 			} else {
-				if (yych <= '`') goto yy110;
-				if (yych <= 'f') goto yy118;
-				goto yy110;
+				if (yych <= '`') goto yy140;
+				if (yych <= 'f') goto yy148;
+				goto yy140;
 			}
 		}
-yy114:
+yy144:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych <= '9') goto yy118;
-			goto yy110;
-		} else {
-			if (yych <= 'F') goto yy118;
-			if (yych <= '`') goto yy110;
-			if (yych <= 'f') goto yy118;
-			goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych <= '9') goto yy148;
+			goto yy140;
+		} else {
+			if (yych <= 'F') goto yy148;
+			if (yych <= '`') goto yy140;
+			if (yych <= 'f') goto yy148;
+			goto yy140;
 		}
-yy115:
+yy145:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych <= '7') goto yy118;
-			if (yych <= '9') goto yy119;
-			goto yy110;
-		} else {
-			if (yych <= 'B') goto yy119;
-			if (yych <= '`') goto yy110;
-			if (yych <= 'b') goto yy119;
-			goto yy110;
-		}
-yy116:
-		yych = *++YYCURSOR;
-		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych <= '7') goto yy120;
-			if (yych <= '9') goto yy121;
-			goto yy110;
-		} else {
-			if (yych <= 'F') goto yy121;
-			if (yych <= '`') goto yy110;
-			if (yych <= 'f') goto yy121;
-			goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych <= '7') goto yy148;
+			if (yych <= '9') goto yy149;
+			goto yy140;
+		} else {
+			if (yych <= 'B') goto yy149;
+			if (yych <= '`') goto yy140;
+			if (yych <= 'b') goto yy149;
+			goto yy140;
 		}
-yy117:
+yy146:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych <= '9') goto yy121;
-			goto yy110;
-		} else {
-			if (yych <= 'F') goto yy121;
-			if (yych <= '`') goto yy110;
-			if (yych <= 'f') goto yy121;
-			goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych <= '7') goto yy150;
+			if (yych <= '9') goto yy151;
+			goto yy140;
+		} else {
+			if (yych <= 'F') goto yy151;
+			if (yych <= '`') goto yy140;
+			if (yych <= 'f') goto yy151;
+			goto yy140;
 		}
-yy118:
+yy147:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych <= '9') goto yy122;
-			goto yy110;
-		} else {
-			if (yych <= 'F') goto yy122;
-			if (yych <= '`') goto yy110;
-			if (yych <= 'f') goto yy122;
-			goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych <= '9') goto yy151;
+			goto yy140;
+		} else {
+			if (yych <= 'F') goto yy151;
+			if (yych <= '`') goto yy140;
+			if (yych <= 'f') goto yy151;
+			goto yy140;
 		}
-yy119:
+yy148:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych <= '9') goto yy123;
-			goto yy110;
-		} else {
-			if (yych <= 'F') goto yy123;
-			if (yych <= '`') goto yy110;
-			if (yych <= 'f') goto yy123;
-			goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych <= '9') goto yy152;
+			goto yy140;
+		} else {
+			if (yych <= 'F') goto yy152;
+			if (yych <= '`') goto yy140;
+			if (yych <= 'f') goto yy152;
+			goto yy140;
 		}
-yy120:
+yy149:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych <= '9') goto yy124;
-			goto yy110;
-		} else {
-			if (yych <= 'F') goto yy124;
-			if (yych <= '`') goto yy110;
-			if (yych <= 'f') goto yy124;
-			goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych <= '9') goto yy153;
+			goto yy140;
+		} else {
+			if (yych <= 'F') goto yy153;
+			if (yych <= '`') goto yy140;
+			if (yych <= 'f') goto yy153;
+			goto yy140;
 		}
-yy121:
+yy150:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych <= '9') goto yy125;
-			goto yy110;
-		} else {
-			if (yych <= 'F') goto yy125;
-			if (yych <= '`') goto yy110;
-			if (yych <= 'f') goto yy125;
-			goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych <= '9') goto yy154;
+			goto yy140;
+		} else {
+			if (yych <= 'F') goto yy154;
+			if (yych <= '`') goto yy140;
+			if (yych <= 'f') goto yy154;
+			goto yy140;
 		}
-yy122:
+yy151:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych <= '9') goto yy126;
-			goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych <= '9') goto yy156;
+			goto yy140;
 		} else {
-			if (yych <= 'F') goto yy126;
-			if (yych <= '`') goto yy110;
-			if (yych <= 'f') goto yy126;
-			goto yy110;
+			if (yych <= 'F') goto yy156;
+			if (yych <= '`') goto yy140;
+			if (yych <= 'f') goto yy156;
+			goto yy140;
 		}
-yy123:
+yy152:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych <= '9') goto yy127;
-			goto yy110;
-		} else {
-			if (yych <= 'F') goto yy127;
-			if (yych <= '`') goto yy110;
-			if (yych <= 'f') goto yy127;
-			goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych <= '9') goto yy158;
+			goto yy140;
+		} else {
+			if (yych <= 'F') goto yy158;
+			if (yych <= '`') goto yy140;
+			if (yych <= 'f') goto yy158;
+			goto yy140;
 		}
-yy124:
+yy153:
+		yych = *++YYCURSOR;
+		if (yych <= '@') {
+			if (yych <= '/') goto yy140;
+			if (yych <= '9') goto yy160;
+			goto yy140;
+		} else {
+			if (yych <= 'F') goto yy160;
+			if (yych <= '`') goto yy140;
+			if (yych <= 'f') goto yy160;
+			goto yy140;
+		}
+yy154:
 		++YYCURSOR;
 		{
 		int utf16 = php_json_ucs2_to_int(s, 2);
@@ -1266,7 +1290,7 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy125:
+yy156:
 		++YYCURSOR;
 		{
 		int utf16 = php_json_ucs2_to_int(s, 3);
@@ -1276,7 +1300,7 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy126:
+yy158:
 		++YYCURSOR;
 		{
 		int utf16 = php_json_ucs2_to_int(s, 4);
@@ -1287,41 +1311,41 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy127:
+yy160:
 		yych = *++YYCURSOR;
-		if (yych != '\\') goto yy110;
+		if (yych != '\\') goto yy140;
 		yych = *++YYCURSOR;
-		if (yych != 'u') goto yy110;
+		if (yych != 'u') goto yy140;
 		yych = *++YYCURSOR;
-		if (yych == 'D') goto yy128;
-		if (yych != 'd') goto yy110;
-yy128:
+		if (yych == 'D') goto yy163;
+		if (yych != 'd') goto yy140;
+yy163:
 		yych = *++YYCURSOR;
-		if (yych <= 'B') goto yy110;
-		if (yych <= 'F') goto yy129;
-		if (yych <= 'b') goto yy110;
-		if (yych >= 'g') goto yy110;
-yy129:
+		if (yych <= 'B') goto yy140;
+		if (yych <= 'F') goto yy164;
+		if (yych <= 'b') goto yy140;
+		if (yych >= 'g') goto yy140;
+yy164:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych >= ':') goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych >= ':') goto yy140;
 		} else {
-			if (yych <= 'F') goto yy130;
-			if (yych <= '`') goto yy110;
-			if (yych >= 'g') goto yy110;
+			if (yych <= 'F') goto yy165;
+			if (yych <= '`') goto yy140;
+			if (yych >= 'g') goto yy140;
 		}
-yy130:
+yy165:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy110;
-			if (yych >= ':') goto yy110;
+			if (yych <= '/') goto yy140;
+			if (yych >= ':') goto yy140;
 		} else {
-			if (yych <= 'F') goto yy131;
-			if (yych <= '`') goto yy110;
-			if (yych >= 'g') goto yy110;
+			if (yych <= 'F') goto yy166;
+			if (yych <= '`') goto yy140;
+			if (yych >= 'g') goto yy140;
 		}
-yy131:
+yy166:
 		++YYCURSOR;
 		{
 		int utf32, utf16_hi, utf16_lo;
@@ -1339,21 +1363,21 @@
 /* *********************************** */
 yyc_STR_P2_UTF:
 		yych = *YYCURSOR;
-		if (yych == '"') goto yy133;
-		if (yych == '\\') goto yy134;
+		if (yych == '"') goto yy172;
+		if (yych == '\\') goto yy174;
 		++YYCURSOR;
 		{ PHP_JSON_CONDITION_GOTO(STR_P2_UTF); }
-yy133:
+yy172:
 		++YYCURSOR;
 		YYSETCONDITION(yycJS);
 		{
 		PHP_JSON_SCANNER_COPY_ESC();
 		return PHP_JSON_T_STRING;
 	}
-yy134:
+yy174:
 		yych = *(YYMARKER = ++YYCURSOR);
-		if (yych == 'u') goto yy136;
-yy135:
+		if (yych == 'u') goto yy176;
+yy175:
 		{
 		char esc;
 		PHP_JSON_SCANNER_COPY_ESC();
@@ -1386,170 +1410,170 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy136:
+yy176:
 		yych = *++YYCURSOR;
 		if (yych <= 'D') {
 			if (yych <= '9') {
-				if (yych <= '/') goto yy137;
-				if (yych <= '0') goto yy138;
-				goto yy139;
-			} else {
-				if (yych <= '@') goto yy137;
-				if (yych <= 'C') goto yy139;
-				goto yy140;
+				if (yych <= '/') goto yy177;
+				if (yych <= '0') goto yy178;
+				goto yy179;
+			} else {
+				if (yych <= '@') goto yy177;
+				if (yych <= 'C') goto yy179;
+				goto yy180;
 			}
 		} else {
 			if (yych <= 'c') {
-				if (yych <= 'F') goto yy139;
-				if (yych >= 'a') goto yy139;
+				if (yych <= 'F') goto yy179;
+				if (yych >= 'a') goto yy179;
 			} else {
-				if (yych <= 'd') goto yy140;
-				if (yych <= 'f') goto yy139;
+				if (yych <= 'd') goto yy180;
+				if (yych <= 'f') goto yy179;
 			}
 		}
-yy137:
+yy177:
 		YYCURSOR = YYMARKER;
-		goto yy135;
-yy138:
+		goto yy175;
+yy178:
 		yych = *++YYCURSOR;
 		if (yych <= '9') {
-			if (yych <= '/') goto yy137;
-			if (yych <= '0') goto yy141;
-			if (yych <= '7') goto yy142;
-			goto yy143;
+			if (yych <= '/') goto yy177;
+			if (yych <= '0') goto yy181;
+			if (yych <= '7') goto yy182;
+			goto yy183;
 		} else {
 			if (yych <= 'F') {
-				if (yych <= '@') goto yy137;
-				goto yy143;
+				if (yych <= '@') goto yy177;
+				goto yy183;
 			} else {
-				if (yych <= '`') goto yy137;
-				if (yych <= 'f') goto yy143;
-				goto yy137;
+				if (yych <= '`') goto yy177;
+				if (yych <= 'f') goto yy183;
+				goto yy177;
 			}
 		}
-yy139:
+yy179:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych <= '9') goto yy143;
-			goto yy137;
-		} else {
-			if (yych <= 'F') goto yy143;
-			if (yych <= '`') goto yy137;
-			if (yych <= 'f') goto yy143;
-			goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych <= '9') goto yy183;
+			goto yy177;
+		} else {
+			if (yych <= 'F') goto yy183;
+			if (yych <= '`') goto yy177;
+			if (yych <= 'f') goto yy183;
+			goto yy177;
 		}
-yy140:
+yy180:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych <= '7') goto yy143;
-			if (yych <= '9') goto yy144;
-			goto yy137;
-		} else {
-			if (yych <= 'B') goto yy144;
-			if (yych <= '`') goto yy137;
-			if (yych <= 'b') goto yy144;
-			goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych <= '7') goto yy183;
+			if (yych <= '9') goto yy184;
+			goto yy177;
+		} else {
+			if (yych <= 'B') goto yy184;
+			if (yych <= '`') goto yy177;
+			if (yych <= 'b') goto yy184;
+			goto yy177;
 		}
-yy141:
+yy181:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych <= '7') goto yy145;
-			if (yych <= '9') goto yy146;
-			goto yy137;
-		} else {
-			if (yych <= 'F') goto yy146;
-			if (yych <= '`') goto yy137;
-			if (yych <= 'f') goto yy146;
-			goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych <= '7') goto yy185;
+			if (yych <= '9') goto yy186;
+			goto yy177;
+		} else {
+			if (yych <= 'F') goto yy186;
+			if (yych <= '`') goto yy177;
+			if (yych <= 'f') goto yy186;
+			goto yy177;
 		}
-yy142:
+yy182:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych <= '9') goto yy146;
-			goto yy137;
-		} else {
-			if (yych <= 'F') goto yy146;
-			if (yych <= '`') goto yy137;
-			if (yych <= 'f') goto yy146;
-			goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych <= '9') goto yy186;
+			goto yy177;
+		} else {
+			if (yych <= 'F') goto yy186;
+			if (yych <= '`') goto yy177;
+			if (yych <= 'f') goto yy186;
+			goto yy177;
 		}
-yy143:
+yy183:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych <= '9') goto yy147;
-			goto yy137;
-		} else {
-			if (yych <= 'F') goto yy147;
-			if (yych <= '`') goto yy137;
-			if (yych <= 'f') goto yy147;
-			goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych <= '9') goto yy187;
+			goto yy177;
+		} else {
+			if (yych <= 'F') goto yy187;
+			if (yych <= '`') goto yy177;
+			if (yych <= 'f') goto yy187;
+			goto yy177;
 		}
-yy144:
+yy184:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych <= '9') goto yy148;
-			goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych <= '9') goto yy188;
+			goto yy177;
 		} else {
-			if (yych <= 'F') goto yy148;
-			if (yych <= '`') goto yy137;
-			if (yych <= 'f') goto yy148;
-			goto yy137;
+			if (yych <= 'F') goto yy188;
+			if (yych <= '`') goto yy177;
+			if (yych <= 'f') goto yy188;
+			goto yy177;
 		}
-yy145:
+yy185:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych <= '9') goto yy149;
-			goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych <= '9') goto yy189;
+			goto yy177;
 		} else {
-			if (yych <= 'F') goto yy149;
-			if (yych <= '`') goto yy137;
-			if (yych <= 'f') goto yy149;
-			goto yy137;
+			if (yych <= 'F') goto yy189;
+			if (yych <= '`') goto yy177;
+			if (yych <= 'f') goto yy189;
+			goto yy177;
 		}
-yy146:
+yy186:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych <= '9') goto yy150;
-			goto yy137;
-		} else {
-			if (yych <= 'F') goto yy150;
-			if (yych <= '`') goto yy137;
-			if (yych <= 'f') goto yy150;
-			goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych <= '9') goto yy191;
+			goto yy177;
+		} else {
+			if (yych <= 'F') goto yy191;
+			if (yych <= '`') goto yy177;
+			if (yych <= 'f') goto yy191;
+			goto yy177;
 		}
-yy147:
+yy187:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych <= '9') goto yy151;
-			goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych <= '9') goto yy193;
+			goto yy177;
 		} else {
-			if (yych <= 'F') goto yy151;
-			if (yych <= '`') goto yy137;
-			if (yych <= 'f') goto yy151;
-			goto yy137;
+			if (yych <= 'F') goto yy193;
+			if (yych <= '`') goto yy177;
+			if (yych <= 'f') goto yy193;
+			goto yy177;
 		}
-yy148:
+yy188:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych <= '9') goto yy152;
-			goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych <= '9') goto yy195;
+			goto yy177;
 		} else {
-			if (yych <= 'F') goto yy152;
-			if (yych <= '`') goto yy137;
-			if (yych <= 'f') goto yy152;
-			goto yy137;
+			if (yych <= 'F') goto yy195;
+			if (yych <= '`') goto yy177;
+			if (yych <= 'f') goto yy195;
+			goto yy177;
 		}
-yy149:
+yy189:
 		++YYCURSOR;
 		{
 		int utf16 = php_json_ucs2_to_int(s, 2);
@@ -1558,7 +1582,7 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy150:
+yy191:
 		++YYCURSOR;
 		{
 		int utf16 = php_json_ucs2_to_int(s, 3);
@@ -1568,7 +1592,7 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy151:
+yy193:
 		++YYCURSOR;
 		{
 		int utf16 = php_json_ucs2_to_int(s, 4);
@@ -1579,41 +1603,41 @@
 		s->str_start = s->cursor;
 		PHP_JSON_CONDITION_GOTO_STR_P2();
 	}
-yy152:
+yy195:
 		yych = *++YYCURSOR;
-		if (yych != '\\') goto yy137;
+		if (yych != '\\') goto yy177;
 		yych = *++YYCURSOR;
-		if (yych != 'u') goto yy137;
+		if (yych != 'u') goto yy177;
 		yych = *++YYCURSOR;
-		if (yych == 'D') goto yy153;
-		if (yych != 'd') goto yy137;
-yy153:
+		if (yych == 'D') goto yy198;
+		if (yych != 'd') goto yy177;
+yy198:
 		yych = *++YYCURSOR;
-		if (yych <= 'B') goto yy137;
-		if (yych <= 'F') goto yy154;
-		if (yych <= 'b') goto yy137;
-		if (yych >= 'g') goto yy137;
-yy154:
+		if (yych <= 'B') goto yy177;
+		if (yych <= 'F') goto yy199;
+		if (yych <= 'b') goto yy177;
+		if (yych >= 'g') goto yy177;
+yy199:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych >= ':') goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych >= ':') goto yy177;
 		} else {
-			if (yych <= 'F') goto yy155;
-			if (yych <= '`') goto yy137;
-			if (yych >= 'g') goto yy137;
+			if (yych <= 'F') goto yy200;
+			if (yych <= '`') goto yy177;
+			if (yych >= 'g') goto yy177;
 		}
-yy155:
+yy200:
 		yych = *++YYCURSOR;
 		if (yych <= '@') {
-			if (yych <= '/') goto yy137;
-			if (yych >= ':') goto yy137;
+			if (yych <= '/') goto yy177;
+			if (yych >= ':') goto yy177;
 		} else {
-			if (yych <= 'F') goto yy156;
-			if (yych <= '`') goto yy137;
-			if (yych >= 'g') goto yy137;
+			if (yych <= 'F') goto yy201;
+			if (yych <= '`') goto yy177;
+			if (yych >= 'g') goto yy177;
 		}
-yy156:
+yy201:
 		++YYCURSOR;
 		{
 		int utf32, utf16_hi, utf16_lo;
diff -Nru php8.2-8.2.29/ext/json/php_json_scanner_defs.h php8.2-8.2.30/ext/json/php_json_scanner_defs.h
--- php8.2-8.2.29/ext/json/php_json_scanner_defs.h	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/json/php_json_scanner_defs.h	2025-12-16 17:18:12.000000000 +0000
@@ -1,8 +1,8 @@
-/* Generated by re2c 4.0 */
+/* Generated by re2c 2.0.3 */
 
 enum YYCONDTYPE {
 	yycJS,
 	yycSTR_P1,
 	yycSTR_P2_BIN,
-	yycSTR_P2_UTF
+	yycSTR_P2_UTF,
 };
diff -Nru php8.2-8.2.29/ext/libxml/libxml.c php8.2-8.2.30/ext/libxml/libxml.c
--- php8.2-8.2.29/ext/libxml/libxml.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/libxml/libxml.c	2025-12-16 17:18:12.000000000 +0000
@@ -418,9 +418,11 @@
 	/* Allocate the Input buffer front-end. */
 	ret = xmlAllocParserInputBuffer(enc);
 	if (ret != NULL) {
+		ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")
 		ret->context = context;
 		ret->readcallback = php_libxml_streams_IO_read;
 		ret->closecallback = php_libxml_streams_IO_close;
+		ZEND_DIAGNOSTIC_IGNORED_END
 	} else
 		php_libxml_streams_IO_close(context);
 
@@ -668,9 +670,12 @@
 				} else {
 					/* make stream not being closed when the zval is freed */
 					GC_ADDREF(stream->res);
+
+					ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")
 					pib->context = stream;
 					pib->readcallback = php_libxml_streams_IO_read;
 					pib->closecallback = php_libxml_streams_IO_close;
+					ZEND_DIAGNOSTIC_IGNORED_END
 
 					ret = xmlNewIOInputStream(context, pib, enc);
 					if (ret == NULL) {
diff -Nru php8.2-8.2.29/ext/opcache/jit/zend_jit.c php8.2-8.2.30/ext/opcache/jit/zend_jit.c
--- php8.2-8.2.29/ext/opcache/jit/zend_jit.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/opcache/jit/zend_jit.c	2025-12-16 17:18:12.000000000 +0000
@@ -5085,6 +5085,14 @@
 #else
 	zend_jit_trace_free_caches(&jit_globals);
 #endif
+
+	/* Reset global pointers to prevent use-after-free in `zend_jit_status()`
+	 * after gracefully restarting Apache with mod_php, see:
+	 * https://github.com/php/php-src/pull/19212 */
+	dasm_ptr = NULL;
+	dasm_buf = NULL;
+	dasm_end = NULL;
+	dasm_size = 0;
 }
 
 static void zend_jit_reset_counters(void)
diff -Nru php8.2-8.2.29/ext/openssl/tests/bug74341.phpt php8.2-8.2.30/ext/openssl/tests/bug74341.phpt
--- php8.2-8.2.29/ext/openssl/tests/bug74341.phpt	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/openssl/tests/bug74341.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -5,6 +5,7 @@
 --SKIPIF--
 <?php
 if (OPENSSL_VERSION_NUMBER >= 0x30300000) die('skip For OpenSSL < 3.3');
+if (substr(PHP_OS, 0, 3) == "WIN") die("skip Failing on Windows");
 ?>
 --FILE--
 <?php
diff -Nru php8.2-8.2.29/ext/openssl/tests/check_default_conf_path.phpt php8.2-8.2.30/ext/openssl/tests/check_default_conf_path.phpt
--- php8.2-8.2.29/ext/openssl/tests/check_default_conf_path.phpt	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/openssl/tests/check_default_conf_path.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -7,6 +7,7 @@
 if (substr(PHP_OS, 0, 3) != 'WIN') {
     die('skip windows only test');
 }
+if (substr(PHP_OS, 0, 3) == "WIN") die("skip Failing on Windows");
 ?>
 --ENV--
 OPENSSL_CONF=
diff -Nru php8.2-8.2.29/ext/openssl/tests/openssl_x509_parse_basic.phpt php8.2-8.2.30/ext/openssl/tests/openssl_x509_parse_basic.phpt
--- php8.2-8.2.29/ext/openssl/tests/openssl_x509_parse_basic.phpt	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/openssl/tests/openssl_x509_parse_basic.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -5,6 +5,7 @@
 --SKIPIF--
 <?php
 if (OPENSSL_VERSION_NUMBER >= 0x30200000) die('skip For OpenSSL < 3.2');
+if (substr(PHP_OS, 0, 3) == "WIN") die("skip Failing on Windows");
 ?>
 --FILE--
 <?php
diff -Nru php8.2-8.2.29/ext/pcre/tests/grep2.phpt php8.2-8.2.30/ext/pcre/tests/grep2.phpt
--- php8.2-8.2.29/ext/pcre/tests/grep2.phpt	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/pcre/tests/grep2.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -21,7 +21,7 @@
 
 ?>
 --EXPECTF--
-Warning: preg_grep(): Compilation failed: quantifier does not follow a repeatable item at offset 0 in %sgrep2.php on line %d
+Warning: preg_grep(): Compilation failed: quantifier does not follow a repeatable item at offset %r(0|1)%r in %sgrep2.php on line %d
 bool(false)
 array(3) {
   [5]=>
diff -Nru php8.2-8.2.29/ext/pcre/tests/pcre_extra.phpt php8.2-8.2.30/ext/pcre/tests/pcre_extra.phpt
--- php8.2-8.2.29/ext/pcre/tests/pcre_extra.phpt	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/pcre/tests/pcre_extra.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -8,8 +8,8 @@
 
 ?>
 --EXPECTF--
-Warning: preg_match(): Compilation failed: unrecognized character follows \ at offset 1 in %spcre_extra.php on line 3
+Warning: preg_match(): Compilation failed: unrecognized character follows \ at offset %r(1|2)%r in %spcre_extra.php on line 3
 bool(false)
 
-Warning: preg_match(): Compilation failed: unrecognized character follows \ at offset 1 in %spcre_extra.php on line 4
+Warning: preg_match(): Compilation failed: unrecognized character follows \ at offset %r(1|2)%r in %spcre_extra.php on line 4
 bool(false)
diff -Nru php8.2-8.2.29/ext/pcre/tests/split.phpt php8.2-8.2.30/ext/pcre/tests/split.phpt
--- php8.2-8.2.29/ext/pcre/tests/split.phpt	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/pcre/tests/split.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -16,7 +16,7 @@
 
 ?>
 --EXPECTF--
-Warning: preg_split(): Compilation failed: quantifier does not follow a repeatable item at offset 0 in %ssplit.php on line %d
+Warning: preg_split(): Compilation failed: quantifier does not follow a repeatable item at offset %r(0|1)%r in %ssplit.php on line %d
 bool(false)
 array(3) {
   [0]=>
diff -Nru php8.2-8.2.29/ext/pdo/pdo_sql_parser.c php8.2-8.2.30/ext/pdo/pdo_sql_parser.c
--- php8.2-8.2.29/ext/pdo/pdo_sql_parser.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/pdo/pdo_sql_parser.c	2025-12-16 17:18:12.000000000 +0000
@@ -1,4 +1,4 @@
-/* Generated by re2c 4.0 */
+/* Generated by re2c 2.0.3 */
 /*
   +----------------------------------------------------------------------+
   | Copyright (c) The PHP Group                                          |
@@ -53,303 +53,303 @@
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
 	switch (yych) {
-		case 0x00: goto yy1;
-		case '"': goto yy4;
-		case '\'': goto yy6;
-		case '(':
-		case ')':
-		case '*':
-		case '+':
-		case ',':
-		case '.': goto yy7;
-		case '-': goto yy8;
-		case '/': goto yy9;
-		case ':': goto yy10;
-		case '?': goto yy11;
-		default: goto yy2;
+	case 0x00:	goto yy2;
+	case '"':	goto yy6;
+	case '\'':	goto yy8;
+	case '(':
+	case ')':
+	case '*':
+	case '+':
+	case ',':
+	case '.':	goto yy9;
+	case '-':	goto yy10;
+	case '/':	goto yy11;
+	case ':':	goto yy12;
+	case '?':	goto yy13;
+	default:	goto yy3;
 	}
-yy1:
-	YYCURSOR = YYMARKER;
-	goto yy5;
 yy2:
+	YYCURSOR = YYMARKER;
+	goto yy7;
+yy3:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch (yych) {
-		case 0x00:
-		case '"':
-		case '\'':
-		case '(':
-		case ')':
-		case '*':
-		case '+':
-		case ',':
-		case '-':
-		case '.':
-		case '/':
-		case ':':
-		case '?': goto yy3;
-		default: goto yy2;
+	case 0x00:
+	case '"':
+	case '\'':
+	case '(':
+	case ')':
+	case '*':
+	case '+':
+	case ',':
+	case '-':
+	case '.':
+	case '/':
+	case ':':
+	case '?':	goto yy5;
+	default:	goto yy3;
 	}
-yy3:
-	{ RET(PDO_PARSER_TEXT); }
-yy4:
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych >= 0x01) goto yy14;
 yy5:
-	{ SKIP_ONE(PDO_PARSER_TEXT); }
+	{ RET(PDO_PARSER_TEXT); }
 yy6:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x00) goto yy5;
-	goto yy18;
+	if (yych >= 0x01) goto yy16;
 yy7:
-	++YYCURSOR;
-	goto yy5;
+	{ SKIP_ONE(PDO_PARSER_TEXT); }
 yy8:
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych <= 0x00) goto yy7;
+	goto yy21;
+yy9:
+	++YYCURSOR;
+	goto yy7;
+yy10:
 	yych = *++YYCURSOR;
 	switch (yych) {
-		case '-': goto yy21;
-		default: goto yy5;
+	case '-':	goto yy25;
+	default:	goto yy7;
 	}
-yy9:
+yy11:
 	yych = *++YYCURSOR;
 	switch (yych) {
-		case '*': goto yy23;
-		default: goto yy5;
+	case '*':	goto yy28;
+	default:	goto yy7;
 	}
-yy10:
+yy12:
 	yych = *++YYCURSOR;
 	switch (yych) {
-		case '0':
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-		case '6':
-		case '7':
-		case '8':
-		case '9':
-		case 'A':
-		case 'B':
-		case 'C':
-		case 'D':
-		case 'E':
-		case 'F':
-		case 'G':
-		case 'H':
-		case 'I':
-		case 'J':
-		case 'K':
-		case 'L':
-		case 'M':
-		case 'N':
-		case 'O':
-		case 'P':
-		case 'Q':
-		case 'R':
-		case 'S':
-		case 'T':
-		case 'U':
-		case 'V':
-		case 'W':
-		case 'X':
-		case 'Y':
-		case 'Z':
-		case '_':
-		case 'a':
-		case 'b':
-		case 'c':
-		case 'd':
-		case 'e':
-		case 'f':
-		case 'g':
-		case 'h':
-		case 'i':
-		case 'j':
-		case 'k':
-		case 'l':
-		case 'm':
-		case 'n':
-		case 'o':
-		case 'p':
-		case 'q':
-		case 'r':
-		case 's':
-		case 't':
-		case 'u':
-		case 'v':
-		case 'w':
-		case 'x':
-		case 'y':
-		case 'z': goto yy24;
-		case ':': goto yy26;
-		default: goto yy5;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':
+	case '_':
+	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy30;
+	case ':':	goto yy33;
+	default:	goto yy7;
 	}
-yy11:
+yy13:
 	yych = *++YYCURSOR;
 	switch (yych) {
-		case '?': goto yy28;
-		default: goto yy12;
+	case '?':	goto yy36;
+	default:	goto yy14;
 	}
-yy12:
+yy14:
 	{ RET(PDO_PARSER_BIND_POS); }
-yy13:
+yy15:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy14:
+yy16:
 	switch (yych) {
-		case 0x00: goto yy1;
-		case '"': goto yy15;
-		case '\\': goto yy16;
-		default: goto yy13;
+	case 0x00:	goto yy2;
+	case '"':	goto yy17;
+	case '\\':	goto yy19;
+	default:	goto yy15;
 	}
-yy15:
+yy17:
 	++YYCURSOR;
 	{ RET(PDO_PARSER_TEXT); }
-yy16:
+yy19:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= 0x00) goto yy1;
-	goto yy13;
-yy17:
+	if (yych <= 0x00) goto yy2;
+	goto yy15;
+yy20:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy18:
+yy21:
 	switch (yych) {
-		case 0x00: goto yy1;
-		case '\'': goto yy19;
-		case '\\': goto yy20;
-		default: goto yy17;
+	case 0x00:	goto yy2;
+	case '\'':	goto yy22;
+	case '\\':	goto yy24;
+	default:	goto yy20;
 	}
-yy19:
+yy22:
 	++YYCURSOR;
 	{ RET(PDO_PARSER_TEXT); }
-yy20:
+yy24:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= 0x00) goto yy1;
-	goto yy17;
-yy21:
+	if (yych <= 0x00) goto yy2;
+	goto yy20;
+yy25:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch (yych) {
-		case '\n':
-		case '\r': goto yy22;
-		default: goto yy21;
+	case '\n':
+	case '\r':	goto yy27;
+	default:	goto yy25;
 	}
-yy22:
+yy27:
 	{ RET(PDO_PARSER_TEXT); }
-yy23:
+yy28:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch (yych) {
-		case '*': goto yy29;
-		default: goto yy23;
+	case '*':	goto yy38;
+	default:	goto yy28;
 	}
-yy24:
+yy30:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch (yych) {
-		case '0':
-		case '1':
-		case '2':
-		case '3':
-		case '4':
-		case '5':
-		case '6':
-		case '7':
-		case '8':
-		case '9':
-		case 'A':
-		case 'B':
-		case 'C':
-		case 'D':
-		case 'E':
-		case 'F':
-		case 'G':
-		case 'H':
-		case 'I':
-		case 'J':
-		case 'K':
-		case 'L':
-		case 'M':
-		case 'N':
-		case 'O':
-		case 'P':
-		case 'Q':
-		case 'R':
-		case 'S':
-		case 'T':
-		case 'U':
-		case 'V':
-		case 'W':
-		case 'X':
-		case 'Y':
-		case 'Z':
-		case '_':
-		case 'a':
-		case 'b':
-		case 'c':
-		case 'd':
-		case 'e':
-		case 'f':
-		case 'g':
-		case 'h':
-		case 'i':
-		case 'j':
-		case 'k':
-		case 'l':
-		case 'm':
-		case 'n':
-		case 'o':
-		case 'p':
-		case 'q':
-		case 'r':
-		case 's':
-		case 't':
-		case 'u':
-		case 'v':
-		case 'w':
-		case 'x':
-		case 'y':
-		case 'z': goto yy24;
-		default: goto yy25;
+	case '0':
+	case '1':
+	case '2':
+	case '3':
+	case '4':
+	case '5':
+	case '6':
+	case '7':
+	case '8':
+	case '9':
+	case 'A':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'E':
+	case 'F':
+	case 'G':
+	case 'H':
+	case 'I':
+	case 'J':
+	case 'K':
+	case 'L':
+	case 'M':
+	case 'N':
+	case 'O':
+	case 'P':
+	case 'Q':
+	case 'R':
+	case 'S':
+	case 'T':
+	case 'U':
+	case 'V':
+	case 'W':
+	case 'X':
+	case 'Y':
+	case 'Z':
+	case '_':
+	case 'a':
+	case 'b':
+	case 'c':
+	case 'd':
+	case 'e':
+	case 'f':
+	case 'g':
+	case 'h':
+	case 'i':
+	case 'j':
+	case 'k':
+	case 'l':
+	case 'm':
+	case 'n':
+	case 'o':
+	case 'p':
+	case 'q':
+	case 'r':
+	case 's':
+	case 't':
+	case 'u':
+	case 'v':
+	case 'w':
+	case 'x':
+	case 'y':
+	case 'z':	goto yy30;
+	default:	goto yy32;
 	}
-yy25:
+yy32:
 	{ RET(PDO_PARSER_BIND); }
-yy26:
+yy33:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch (yych) {
-		case ':': goto yy26;
-		default: goto yy27;
+	case ':':	goto yy33;
+	default:	goto yy35;
 	}
-yy27:
+yy35:
 	{ RET(PDO_PARSER_TEXT); }
-yy28:
+yy36:
 	++YYCURSOR;
 	{ RET(PDO_PARSER_ESCAPED_QUESTION); }
-yy29:
+yy38:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
 	switch (yych) {
-		case '*': goto yy29;
-		case '/': goto yy30;
-		default: goto yy23;
+	case '*':	goto yy38;
+	case '/':	goto yy40;
+	default:	goto yy28;
 	}
-yy30:
+yy40:
 	++YYCURSOR;
-	goto yy22;
+	goto yy27;
 }
 
 }
@@ -574,6 +574,12 @@
 							}
 
 							plc->quoted = stmt->dbh->methods->quoter(stmt->dbh, buf, param_type);
+							if (plc->quoted == NULL) {
+								/* bork */
+								ret = -1;
+								strncpy(stmt->error_code, stmt->dbh->error_code, 6);
+								goto clean_up;
+							}
 						}
 					}
 
diff -Nru php8.2-8.2.29/ext/pdo/pdo_sql_parser.re php8.2-8.2.30/ext/pdo/pdo_sql_parser.re
--- php8.2-8.2.29/ext/pdo/pdo_sql_parser.re	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/pdo/pdo_sql_parser.re	2025-12-16 17:18:12.000000000 +0000
@@ -287,6 +287,12 @@
 							}
 
 							plc->quoted = stmt->dbh->methods->quoter(stmt->dbh, buf, param_type);
+							if (plc->quoted == NULL) {
+								/* bork */
+								ret = -1;
+								strncpy(stmt->error_code, stmt->dbh->error_code, 6);
+								goto clean_up;
+							}
 						}
 					}
 
diff -Nru php8.2-8.2.29/ext/pdo_pgsql/tests/ghsa-8xr5-qppj-gvwj.phpt php8.2-8.2.30/ext/pdo_pgsql/tests/ghsa-8xr5-qppj-gvwj.phpt
--- php8.2-8.2.29/ext/pdo_pgsql/tests/ghsa-8xr5-qppj-gvwj.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php8.2-8.2.30/ext/pdo_pgsql/tests/ghsa-8xr5-qppj-gvwj.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -0,0 +1,28 @@
+--TEST--
+#GHSA-8xr5-qppj-gvwj: NULL Pointer Derefernce for failed user input quoting
+--EXTENSIONS--
+pdo
+pdo_pgsql
+--SKIPIF--
+<?php
+require_once dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+require_once dirname(__FILE__) . '/config.inc';
+PDOTest::skip();
+?>
+--FILE--
+<?php
+require_once dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc';
+require_once dirname(__FILE__) . '/config.inc';
+$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt');
+$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
+$db->setAttribute(PDO::ATTR_EMULATE_PREPARES, true);
+
+$sql = "SELECT * FROM users where username = :username";
+$stmt = $db->prepare($sql);
+
+$p1 = "alice\x99";
+var_dump($stmt->execute(['username' => $p1]));
+
+?>
+--EXPECT--
+bool(false)
diff -Nru php8.2-8.2.29/ext/phar/phar_path_check.c php8.2-8.2.30/ext/phar/phar_path_check.c
--- php8.2-8.2.29/ext/phar/phar_path_check.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/phar/phar_path_check.c	2025-12-16 17:18:12.000000000 +0000
@@ -1,4 +1,4 @@
-/* Generated by re2c 4.0 */
+/* Generated by re2c 2.0.3 */
 /*
   +----------------------------------------------------------------------+
   | phar php single-file executable PHP extension                        |
@@ -48,42 +48,42 @@
 	if (yych <= '[') {
 		if (yych <= ')') {
 			if (yych <= '\f') {
-				if (yych >= 0x01) goto yy1;
+				if (yych >= 0x01) goto yy4;
 			} else {
-				if (yych <= '\r') goto yy3;
-				if (yych <= 0x19) goto yy1;
-				goto yy4;
+				if (yych <= '\r') goto yy6;
+				if (yych <= 0x19) goto yy4;
+				goto yy7;
 			}
 		} else {
 			if (yych <= '/') {
-				if (yych <= '*') goto yy6;
-				if (yych <= '.') goto yy4;
-				goto yy7;
+				if (yych <= '*') goto yy9;
+				if (yych <= '.') goto yy7;
+				goto yy11;
 			} else {
-				if (yych == '?') goto yy8;
-				goto yy4;
+				if (yych == '?') goto yy12;
+				goto yy7;
 			}
 		}
 	} else {
 		if (yych <= 0xEC) {
 			if (yych <= 0xC1) {
-				if (yych <= '\\') goto yy9;
-				if (yych <= 0x7F) goto yy4;
-				goto yy1;
+				if (yych <= '\\') goto yy14;
+				if (yych <= 0x7F) goto yy7;
+				goto yy4;
 			} else {
-				if (yych <= 0xDF) goto yy10;
-				if (yych <= 0xE0) goto yy11;
-				goto yy12;
+				if (yych <= 0xDF) goto yy16;
+				if (yych <= 0xE0) goto yy17;
+				goto yy18;
 			}
 		} else {
 			if (yych <= 0xF0) {
-				if (yych <= 0xED) goto yy13;
-				if (yych <= 0xEF) goto yy12;
-				goto yy14;
+				if (yych <= 0xED) goto yy19;
+				if (yych <= 0xEF) goto yy18;
+				goto yy20;
 			} else {
-				if (yych <= 0xF3) goto yy15;
-				if (yych <= 0xF4) goto yy16;
-				goto yy1;
+				if (yych <= 0xF3) goto yy21;
+				if (yych <= 0xF4) goto yy22;
+				goto yy4;
 			}
 		}
 	}
@@ -101,37 +101,37 @@
 			*error = NULL;
 			return pcr_is_ok;
 		}
-yy1:
+yy4:
 	++YYCURSOR;
-yy2:
+yy5:
 	{
 			*error ="illegal character";
 			return pcr_err_illegal_char;
 		}
-yy3:
+yy6:
 	yych = *++YYCURSOR;
-	if (yych == '\n') goto yy1;
-	goto yy2;
-yy4:
+	if (yych == '\n') goto yy4;
+	goto yy5;
+yy7:
 	++YYCURSOR;
-yy5:
+yy8:
 	{
 			goto loop;
 		}
-yy6:
+yy9:
 	++YYCURSOR;
 	{
 			*error = "star";
 			return pcr_err_star;
 		}
-yy7:
+yy11:
 	yyaccept = 0;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '-') goto yy5;
-	if (yych <= '.') goto yy17;
-	if (yych <= '/') goto yy19;
-	goto yy5;
-yy8:
+	if (yych <= '-') goto yy8;
+	if (yych <= '.') goto yy23;
+	if (yych <= '/') goto yy25;
+	goto yy8;
+yy12:
 	++YYCURSOR;
 	{
 			if (**s == '/') {
@@ -141,90 +141,93 @@
 			*error = NULL;
 			return pcr_use_query;
 		}
-yy9:
+yy14:
 	++YYCURSOR;
 	{
 			*error = "back-slash";
 			return pcr_err_back_slash;
 		}
-yy10:
+yy16:
 	yych = *++YYCURSOR;
-	if (yych <= 0x7F) goto yy2;
-	if (yych <= 0xBF) goto yy4;
-	goto yy2;
-yy11:
+	if (yych <= 0x7F) goto yy5;
+	if (yych <= 0xBF) goto yy7;
+	goto yy5;
+yy17:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x9F) goto yy2;
-	if (yych <= 0xBF) goto yy20;
-	goto yy2;
-yy12:
+	if (yych <= 0x9F) goto yy5;
+	if (yych <= 0xBF) goto yy27;
+	goto yy5;
+yy18:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x7F) goto yy2;
-	if (yych <= 0xBF) goto yy20;
-	goto yy2;
-yy13:
+	if (yych <= 0x7F) goto yy5;
+	if (yych <= 0xBF) goto yy27;
+	goto yy5;
+yy19:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x7F) goto yy2;
-	if (yych <= 0x9F) goto yy20;
-	goto yy2;
-yy14:
+	if (yych <= 0x7F) goto yy5;
+	if (yych <= 0x9F) goto yy27;
+	goto yy5;
+yy20:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x8F) goto yy2;
-	if (yych <= 0xBF) goto yy21;
-	goto yy2;
-yy15:
+	if (yych <= 0x8F) goto yy5;
+	if (yych <= 0xBF) goto yy28;
+	goto yy5;
+yy21:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x7F) goto yy2;
-	if (yych <= 0xBF) goto yy21;
-	goto yy2;
-yy16:
+	if (yych <= 0x7F) goto yy5;
+	if (yych <= 0xBF) goto yy28;
+	goto yy5;
+yy22:
 	yyaccept = 1;
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x7F) goto yy2;
-	if (yych <= 0x8F) goto yy21;
-	goto yy2;
-yy17:
+	if (yych <= 0x7F) goto yy5;
+	if (yych <= 0x8F) goto yy28;
+	goto yy5;
+yy23:
 	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy22;
-	if (yych <= '-') goto yy18;
-	if (yych <= '.') goto yy23;
-	if (yych <= '/') goto yy22;
-yy18:
+	if (yych <= 0x00) goto yy29;
+	if (yych <= '-') goto yy24;
+	if (yych <= '.') goto yy31;
+	if (yych <= '/') goto yy29;
+yy24:
 	YYCURSOR = YYMARKER;
-	if (yyaccept == 0) goto yy5;
-	else goto yy2;
-yy19:
+	if (yyaccept == 0) {
+		goto yy8;
+	} else {
+		goto yy5;
+	}
+yy25:
 	++YYCURSOR;
 	{
 			*error = "double slash";
 			return pcr_err_double_slash;
 		}
-yy20:
-	yych = *++YYCURSOR;
-	if (yych <= 0x7F) goto yy18;
-	if (yych <= 0xBF) goto yy4;
-	goto yy18;
-yy21:
+yy27:
 	yych = *++YYCURSOR;
-	if (yych <= 0x7F) goto yy18;
-	if (yych <= 0xBF) goto yy20;
-	goto yy18;
-yy22:
+	if (yych <= 0x7F) goto yy24;
+	if (yych <= 0xBF) goto yy7;
+	goto yy24;
+yy28:
+	yych = *++YYCURSOR;
+	if (yych <= 0x7F) goto yy24;
+	if (yych <= 0xBF) goto yy27;
+	goto yy24;
+yy29:
 	++YYCURSOR;
 	{
 			*error = "current directory reference";
 			return pcr_err_curr_dir;
 		}
-yy23:
+yy31:
 	yych = *++YYCURSOR;
-	if (yych <= 0x00) goto yy24;
-	if (yych != '/') goto yy18;
-yy24:
+	if (yych <= 0x00) goto yy32;
+	if (yych != '/') goto yy24;
+yy32:
 	++YYCURSOR;
 	{
 			*error = "upper directory reference";
diff -Nru php8.2-8.2.29/ext/phar/tests/tar/bug70417.phpt php8.2-8.2.30/ext/phar/tests/tar/bug70417.phpt
--- php8.2-8.2.29/ext/phar/tests/tar/bug70417.phpt	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/phar/tests/tar/bug70417.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -3,32 +3,17 @@
 --EXTENSIONS--
 phar
 zlib
---SKIPIF--
-<?php
-
-exec('lsof -p ' . getmypid(), $out, $status);
-if ($status !== 0) {
-    die("skip lsof(8) not available");
-}
-if (!str_starts_with($out[0], 'COMMAND')) {
-    die("skip Might be a different lsof");
-}
-?>
 --FILE--
 <?php
-function countOpenFiles() {
-    exec('lsof -p ' . escapeshellarg(getmypid()) . ' 2> /dev/null', $out);  // Note: valgrind can produce false positives for /usr/bin/lsof
-    return count($out);
-}
 $filename = __DIR__ . '/bug70417.tar';
 @unlink("$filename.gz");
-$openFiles1 = countOpenFiles();
+$resBefore = count(get_resources());
 $arch = new PharData($filename);
 $arch->addFromString('foo', 'bar');
 $arch->compress(Phar::GZ);
 unset($arch);
-$openFiles2 = countOpenFiles();
-var_dump($openFiles1 === $openFiles2);
+$resAfter = count(get_resources());
+var_dump($resBefore === $resAfter);
 ?>
 --CLEAN--
 <?php
diff -Nru php8.2-8.2.29/ext/standard/array.c php8.2-8.2.30/ext/standard/array.c
--- php8.2-8.2.29/ext/standard/array.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/standard/array.c	2025-12-16 17:18:12.000000000 +0000
@@ -3903,7 +3903,7 @@
 	int argc, i;
 	zval *src_entry;
 	HashTable *src, *dest;
-	uint32_t count = 0;
+	uint64_t count = 0;
 
 	ZEND_PARSE_PARAMETERS_START(0, -1)
 		Z_PARAM_VARIADIC('+', args, argc)
@@ -3923,6 +3923,11 @@
 		count += zend_hash_num_elements(Z_ARRVAL_P(arg));
 	}
 
+	if (UNEXPECTED(count >= HT_MAX_SIZE)) {
+		zend_throw_error(NULL, "The total number of elements must be lower than %u", HT_MAX_SIZE);
+		RETURN_THROWS();
+	}
+
 	if (argc == 2) {
 		zval *ret = NULL;
 
diff -Nru php8.2-8.2.29/ext/standard/basic_functions.c php8.2-8.2.30/ext/standard/basic_functions.c
--- php8.2-8.2.29/ext/standard/basic_functions.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/standard/basic_functions.c	2025-12-16 17:18:12.000000000 +0000
@@ -578,7 +578,7 @@
 	char buffer[17];
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STRING(address, address_len)
+		Z_PARAM_PATH(address, address_len)
 	ZEND_PARSE_PARAMETERS_END();
 
 	memset(buffer, 0, sizeof(buffer));
@@ -615,7 +615,7 @@
 #endif
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STRING(addr, addr_len)
+		Z_PARAM_PATH(addr, addr_len)
 	ZEND_PARSE_PARAMETERS_END();
 
 #ifdef HAVE_INET_PTON
@@ -2214,8 +2214,8 @@
 	struct servent *serv;
 
 	ZEND_PARSE_PARAMETERS_START(2, 2)
-		Z_PARAM_STR(name)
-		Z_PARAM_STRING(proto, proto_len)
+		Z_PARAM_PATH_STR(name)
+		Z_PARAM_PATH(proto, proto_len)
 	ZEND_PARSE_PARAMETERS_END();
 
 
@@ -2258,7 +2258,7 @@
 
 	ZEND_PARSE_PARAMETERS_START(2, 2)
 		Z_PARAM_LONG(port)
-		Z_PARAM_STRING(proto, proto_len)
+		Z_PARAM_PATH(proto, proto_len)
 	ZEND_PARSE_PARAMETERS_END();
 
 	serv = getservbyport(htons((unsigned short) port), proto);
@@ -2285,7 +2285,7 @@
 	struct protoent *ent;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STRING(name, name_len)
+		Z_PARAM_PATH(name, name_len)
 	ZEND_PARSE_PARAMETERS_END();
 
 	ent = getprotobyname(name);
diff -Nru php8.2-8.2.29/ext/standard/dns.c php8.2-8.2.30/ext/standard/dns.c
--- php8.2-8.2.29/ext/standard/dns.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/standard/dns.c	2025-12-16 17:18:12.000000000 +0000
@@ -379,7 +379,7 @@
 #endif
 
 	ZEND_PARSE_PARAMETERS_START(1, 2)
-		Z_PARAM_STRING(hostname, hostname_len)
+		Z_PARAM_PATH(hostname, hostname_len)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_STR(rectype)
 	ZEND_PARSE_PARAMETERS_END();
@@ -826,7 +826,7 @@
 	bool raw = 0;
 
 	ZEND_PARSE_PARAMETERS_START(1, 5)
-		Z_PARAM_STRING(hostname, hostname_len)
+		Z_PARAM_PATH(hostname, hostname_len)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_LONG(type_param)
 		Z_PARAM_ZVAL(authns)
@@ -1064,7 +1064,7 @@
 #endif
 
 	ZEND_PARSE_PARAMETERS_START(2, 3)
-		Z_PARAM_STRING(hostname, hostname_len)
+		Z_PARAM_PATH(hostname, hostname_len)
 		Z_PARAM_ZVAL(mx_list)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_ZVAL(weight_list)
diff -Nru php8.2-8.2.29/ext/standard/dns_win32.c php8.2-8.2.30/ext/standard/dns_win32.c
--- php8.2-8.2.29/ext/standard/dns_win32.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/standard/dns_win32.c	2025-12-16 17:18:12.000000000 +0000
@@ -48,7 +48,7 @@
 	DNS_STATUS      status;                 /* Return value of DnsQuery_A() function */
 	PDNS_RECORD     pResult, pRec;          /* Pointer to DNS_RECORD structure */
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "sz|z", &hostname, &hostname_len, &mx_list, &weight_list) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "pz|z", &hostname, &hostname_len, &mx_list, &weight_list) == FAILURE) {
 		RETURN_THROWS();
 	}
 
@@ -102,7 +102,7 @@
 	DNS_STATUS      status;                 /* Return value of DnsQuery_A() function */
 	PDNS_RECORD     pResult;          /* Pointer to DNS_RECORD structure */
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|S", &hostname, &hostname_len, &rectype) == FAILURE) {
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|S", &hostname, &hostname_len, &rectype) == FAILURE) {
 		RETURN_THROWS();
 	}
 
@@ -354,7 +354,7 @@
 	int type, type_to_fetch, first_query = 1, store_results = 1;
 	bool raw = 0;
 
-	if (zend_parse_parameters(ZEND_NUM_ARGS(), "s|lz!z!b",
+	if (zend_parse_parameters(ZEND_NUM_ARGS(), "p|lz!z!b",
 			&hostname, &hostname_len, &type_param, &authns, &addtl, &raw) == FAILURE) {
 		RETURN_THROWS();
 	}
diff -Nru php8.2-8.2.29/ext/standard/image.c php8.2-8.2.30/ext/standard/image.c
--- php8.2-8.2.29/ext/standard/image.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/standard/image.c	2025-12-16 17:18:12.000000000 +0000
@@ -403,6 +403,7 @@
 		if (read_now < stream->chunk_size && read_total != length) {
 			return 0;
 		}
+		buffer += read_now;
 	} while (read_total < length);
 
 	return read_total;
diff -Nru php8.2-8.2.29/ext/standard/tests/array/GHSA-h96m-rvf9-jgm2.phpt php8.2-8.2.30/ext/standard/tests/array/GHSA-h96m-rvf9-jgm2.phpt
--- php8.2-8.2.29/ext/standard/tests/array/GHSA-h96m-rvf9-jgm2.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php8.2-8.2.30/ext/standard/tests/array/GHSA-h96m-rvf9-jgm2.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -0,0 +1,16 @@
+--TEST--
+GHSA-h96m-rvf9-jgm2
+--FILE--
+<?php
+
+$power = 20; // Chosen to be well within a memory_limit
+$arr = range(0, 2**$power);
+try {
+    array_merge(...array_fill(0, 2**(32-$power), $arr));
+} catch (Error $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECTF--
+The total number of elements must be lower than %d
diff -Nru php8.2-8.2.29/ext/standard/tests/file/chmod_variation2.phpt php8.2-8.2.30/ext/standard/tests/file/chmod_variation2.phpt
--- php8.2-8.2.29/ext/standard/tests/file/chmod_variation2.phpt	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/standard/tests/file/chmod_variation2.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -34,7 +34,7 @@
 printf("%o\n", fileperms($filepath) & PERMISSIONS_MASK);
 
 echo "\nchmod() on a linked file\n";
-$linkname = "somelink";
+$linkname = "somelink2";
 var_dump(symlink($filepath, $linkname));
 var_dump(chmod($filepath, 0777));
 var_dump(chmod($linkname, 0755));
diff -Nru php8.2-8.2.29/ext/standard/tests/file/file_variation5.phpt php8.2-8.2.30/ext/standard/tests/file/file_variation5.phpt
--- php8.2-8.2.29/ext/standard/tests/file/file_variation5.phpt	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/standard/tests/file/file_variation5.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -27,7 +27,7 @@
 var_dump(file("./$test_dirname/bad_dir/../../$filename"));
 
 echo "\nfile() on a linked file\n";
-$linkname = "somelink";
+$linkname = "somelink5";
 var_dump(symlink($filepath, $linkname));
 var_dump(file($linkname));
 var_dump(unlink($linkname));
diff -Nru php8.2-8.2.29/ext/standard/tests/image/gh20584.phpt php8.2-8.2.30/ext/standard/tests/image/gh20584.phpt
--- php8.2-8.2.29/ext/standard/tests/image/gh20584.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php8.2-8.2.30/ext/standard/tests/image/gh20584.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -0,0 +1,39 @@
+--TEST--
+GH-20584 (Information Leak of Memory)
+--CREDITS--
+Nikita Sveshnikov (Positive Technologies)
+--FILE--
+<?php
+// Minimal PoC: corruption/uninitialized memory leak when reading APP1 via php://filter
+$file = __DIR__ . '/gh20584.jpg';
+
+// Make APP1 large enough so it is read in multiple chunks
+$chunk = 8192;
+$tail = 123;
+$payload = str_repeat('A', $chunk) . str_repeat('B', $chunk) . str_repeat('Z',
+$tail);
+$app1Len = 2 + strlen($payload);
+
+// Minimal JPEG: SOI + APP1 + SOF0(1x1) + EOI
+$sof = "\xFF\xC0" . pack('n', 11) . "\x08" . pack('n',1) . pack('n',1) .
+"\x01\x11\x00";
+$jpeg = "\xFF\xD8" . "\xFF\xE1" . pack('n', $app1Len) . $payload . $sof .
+"\xFF\xD9";
+file_put_contents($file, $jpeg);
+
+// Read through a filter to enforce multiple reads
+$src = 'php://filter/read=string.rot13|string.rot13/resource=' . $file;
+$info = null;
+@getimagesize($src, $info);
+$exp = $payload;
+$ret = $info['APP1'];
+
+var_dump($ret === $exp);
+
+?>
+--CLEAN--
+<?php
+@unlink(__DIR__ . '/gh20584.jpg');
+?>
+--EXPECT--
+bool(true)
diff -Nru php8.2-8.2.29/ext/standard/tests/mail/CONFLICTS php8.2-8.2.30/ext/standard/tests/mail/CONFLICTS
--- php8.2-8.2.29/ext/standard/tests/mail/CONFLICTS	1970-01-01 00:00:00.000000000 +0000
+++ php8.2-8.2.30/ext/standard/tests/mail/CONFLICTS	2025-12-16 17:18:12.000000000 +0000
@@ -0,0 +1 @@
+imap
diff -Nru php8.2-8.2.29/ext/standard/tests/network/ghsa-www2-q4fc-65wf.phpt php8.2-8.2.30/ext/standard/tests/network/ghsa-www2-q4fc-65wf.phpt
--- php8.2-8.2.29/ext/standard/tests/network/ghsa-www2-q4fc-65wf.phpt	1970-01-01 00:00:00.000000000 +0000
+++ php8.2-8.2.30/ext/standard/tests/network/ghsa-www2-q4fc-65wf.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -0,0 +1,62 @@
+--TEST--
+GHSA-www2-q4fc-65wf
+--DESCRIPTION--
+This is a ZPP test but *keep* this as it is security-sensitive!
+--FILE--
+<?php
+try {
+    dns_check_record("\0");
+} catch (ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    dns_get_mx("\0", $out);
+} catch (ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    dns_get_record("\0");
+} catch (ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    getprotobyname("\0");
+} catch (ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    getservbyname("\0", "tcp");
+} catch (ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    getservbyname("x", "tcp\0");
+} catch (ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    getservbyport(0, "tcp\0");
+} catch (ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    inet_pton("\0");
+} catch (ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+try {
+    ip2long("\0");
+} catch (ValueError $e) {
+    echo $e->getMessage(), "\n";
+}
+?>
+--EXPECT--
+dns_check_record(): Argument #1 ($hostname) must not contain any null bytes
+dns_get_mx(): Argument #1 ($hostname) must not contain any null bytes
+dns_get_record(): Argument #1 ($hostname) must not contain any null bytes
+getprotobyname(): Argument #1 ($protocol) must not contain any null bytes
+getservbyname(): Argument #1 ($service) must not contain any null bytes
+getservbyname(): Argument #2 ($protocol) must not contain any null bytes
+getservbyport(): Argument #2 ($protocol) must not contain any null bytes
+inet_pton(): Argument #1 ($ip) must not contain any null bytes
+ip2long(): Argument #1 ($ip) must not contain any null bytes
diff -Nru php8.2-8.2.29/ext/standard/tests/network/udp4loop.phpt php8.2-8.2.30/ext/standard/tests/network/udp4loop.phpt
--- php8.2-8.2.29/ext/standard/tests/network/udp4loop.phpt	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/standard/tests/network/udp4loop.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -3,7 +3,7 @@
 --FILE--
 <?php
     /* Setup socket server */
-    for ($port = 31338; $port < 31500; ++$port) {
+    for ($port = 31339; $port < 31500; ++$port) {
       $uri = "udp://127.0.0.1:$port";
       $server = @stream_socket_server($uri, $errno, $errstr, STREAM_SERVER_BIND);
       if ($server) break;
diff -Nru php8.2-8.2.29/ext/standard/url_scanner_ex.c php8.2-8.2.30/ext/standard/url_scanner_ex.c
--- php8.2-8.2.29/ext/standard/url_scanner_ex.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/standard/url_scanner_ex.c	2025-12-16 17:18:12.000000000 +0000
@@ -1,4 +1,4 @@
-/* Generated by re2c 4.0 */
+/* Generated by re2c 2.0.3 */
 /*
   +----------------------------------------------------------------------+
   | Copyright (c) The PHP Group                                          |
@@ -518,51 +518,55 @@
 
 {
 	YYCTYPE yych;
-	static const unsigned char yybm[256] = {
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128,   0, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128
+	static const unsigned char yybm[] = {
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128,   0, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
 	};
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yybm[0+yych] & 128) goto yy1;
-	goto yy2;
-yy1:
+	if (yybm[0+yych] & 128) {
+		goto yy2;
+	}
+	goto yy5;
+yy2:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yybm[0+yych] & 128) goto yy1;
+	if (yybm[0+yych] & 128) {
+		goto yy2;
+	}
 	{ passthru(STD_ARGS); goto state_plain; }
-yy2:
+yy5:
 	++YYCURSOR;
 	{ passthru(STD_ARGS); STATE = STATE_TAG; goto state_tag; }
 }
@@ -573,50 +577,54 @@
 
 {
 	YYCTYPE yych;
-	static const unsigned char yybm[256] = {
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0, 128,   0,   0,   0,   0,   0,
-		  0, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128,   0,   0,   0,   0,   0,
-		  0, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0
+	static const unsigned char yybm[] = {
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0, 128,   0,   0,   0,   0,   0, 
+		  0, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128,   0,   0,   0,   0,   0, 
+		  0, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
 	};
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yybm[0+yych] & 128) goto yy4;
+	if (yybm[0+yych] & 128) {
+		goto yy11;
+	}
 	++YYCURSOR;
 	{ passthru(STD_ARGS); goto state_plain_begin; }
-yy4:
+yy11:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yybm[0+yych] & 128) goto yy4;
+	if (yybm[0+yych] & 128) {
+		goto yy11;
+	}
 	{ handle_tag(STD_ARGS); /* Sets STATE */; passthru(STD_ARGS); if (STATE == STATE_PLAIN) goto state_plain; else goto state_next_arg; }
 }
 
@@ -629,71 +637,75 @@
 
 {
 	YYCTYPE yych;
-	static const unsigned char yybm[256] = {
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0, 128, 128, 128,   0, 128,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		128,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0
+	static const unsigned char yybm[] = {
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0, 128, 128, 128,   0, 128,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		128,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
 	};
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	if (yybm[0+yych] & 128) goto yy8;
+	if (yybm[0+yych] & 128) {
+		goto yy18;
+	}
 	if (yych <= '>') {
-		if (yych == '/') goto yy9;
-		if (yych >= '>') goto yy10;
+		if (yych == '/') goto yy21;
+		if (yych >= '>') goto yy22;
 	} else {
 		if (yych <= 'Z') {
-			if (yych >= 'A') goto yy11;
+			if (yych >= 'A') goto yy24;
 		} else {
-			if (yych <= '`') goto yy6;
-			if (yych <= 'z') goto yy11;
+			if (yych <= '`') goto yy16;
+			if (yych <= 'z') goto yy24;
 		}
 	}
-yy6:
+yy16:
 	++YYCURSOR;
-yy7:
+yy17:
 	{ passthru(STD_ARGS); goto state_plain_begin; }
-yy8:
+yy18:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yybm[0+yych] & 128) goto yy8;
+	if (yybm[0+yych] & 128) {
+		goto yy18;
+	}
 	{ passthru(STD_ARGS); goto state_next_arg; }
-yy9:
+yy21:
 	yych = *++YYCURSOR;
-	if (yych != '>') goto yy7;
-yy10:
+	if (yych != '>') goto yy17;
+yy22:
 	++YYCURSOR;
 	{ passthru(STD_ARGS); handle_form(STD_ARGS); goto state_plain_begin; }
-yy11:
+yy24:
 	++YYCURSOR;
 	{ --YYCURSOR; STATE = STATE_ARG; goto state_arg; }
 }
@@ -704,54 +716,56 @@
 
 {
 	YYCTYPE yych;
-	static const unsigned char yybm[256] = {
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0, 128,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128,   0,   0,   0,   0,   0,
-		  0, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128, 128,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0
+	static const unsigned char yybm[] = {
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0, 128,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128,   0,   0,   0,   0,   0, 
+		  0, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128, 128,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
 	};
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= '@') goto yy13;
-	if (yych <= 'Z') goto yy14;
-	if (yych <= '`') goto yy13;
-	if (yych <= 'z') goto yy14;
-yy13:
+	if (yych <= '@') goto yy28;
+	if (yych <= 'Z') goto yy30;
+	if (yych <= '`') goto yy28;
+	if (yych <= 'z') goto yy30;
+yy28:
 	++YYCURSOR;
 	{ passthru(STD_ARGS); STATE = STATE_NEXT_ARG; goto state_next_arg; }
-yy14:
+yy30:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yybm[0+yych] & 128) goto yy14;
+	if (yybm[0+yych] & 128) {
+		goto yy30;
+	}
 	{ passthru(STD_ARGS); handle_arg(STD_ARGS); STATE = STATE_BEFORE_VAL; goto state_before_val; }
 }
 
@@ -761,65 +775,67 @@
 
 {
 	YYCTYPE yych;
-	static const unsigned char yybm[256] = {
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		128,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0
+	static const unsigned char yybm[] = {
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		128,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
 	};
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	if (yych == ' ') goto yy17;
-	if (yych == '=') goto yy18;
+	if (yych == ' ') goto yy37;
+	if (yych == '=') goto yy38;
 	++YYCURSOR;
-yy16:
+yy36:
 	{ --YYCURSOR; goto state_next_arg_begin; }
-yy17:
+yy37:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ' ') goto yy19;
-	if (yych != '=') goto yy16;
-yy18:
+	if (yych == ' ') goto yy41;
+	if (yych != '=') goto yy36;
+yy38:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yybm[0+yych] & 128) goto yy18;
+	if (yybm[0+yych] & 128) {
+		goto yy38;
+	}
 	{ passthru(STD_ARGS); STATE = STATE_VAL; goto state_val; }
-yy19:
+yy41:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych == ' ') goto yy19;
-	if (yych == '=') goto yy18;
+	if (yych == ' ') goto yy41;
+	if (yych == '=') goto yy38;
 	YYCURSOR = YYMARKER;
-	goto yy16;
+	goto yy36;
 }
 
 
@@ -829,85 +845,93 @@
 
 {
 	YYCTYPE yych;
-	static const unsigned char yybm[256] = {
-		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, 128, 224, 224, 224, 224,  64,
-		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
+	static const unsigned char yybm[] = {
+		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, 128, 224, 224, 224, 224,  64, 
+		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) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	if (yybm[0+yych] & 32) goto yy21;
-	if (yych <= ' ') goto yy22;
-	if (yych <= '"') goto yy24;
-	if (yych <= '\'') goto yy25;
-	goto yy22;
-yy21:
+	if (yybm[0+yych] & 32) {
+		goto yy46;
+	}
+	if (yych <= ' ') goto yy49;
+	if (yych <= '"') goto yy51;
+	if (yych <= '\'') goto yy52;
+	goto yy49;
+yy46:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yybm[0+yych] & 32) goto yy21;
+	if (yybm[0+yych] & 32) {
+		goto yy46;
+	}
 	{ handle_val(STD_ARGS, 0, ' '); goto state_next_arg_begin; }
-yy22:
+yy49:
 	++YYCURSOR;
-yy23:
+yy50:
 	{ passthru(STD_ARGS); goto state_next_arg_begin; }
-yy24:
+yy51:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '>') goto yy23;
-	goto yy27;
-yy25:
+	if (yych == '>') goto yy50;
+	goto yy54;
+yy52:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '>') goto yy23;
-	goto yy31;
-yy26:
+	if (yych == '>') goto yy50;
+	goto yy59;
+yy53:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy27:
-	if (yybm[0+yych] & 64) goto yy26;
-	if (yych <= '"') goto yy29;
-yy28:
+yy54:
+	if (yybm[0+yych] & 64) {
+		goto yy53;
+	}
+	if (yych <= '"') goto yy56;
+yy55:
 	YYCURSOR = YYMARKER;
-	goto yy23;
-yy29:
+	goto yy50;
+yy56:
 	++YYCURSOR;
 	{ handle_val(STD_ARGS, 1, '"'); goto state_next_arg_begin; }
-yy30:
+yy58:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-yy31:
-	if (yybm[0+yych] & 128) goto yy30;
-	if (yych >= '(') goto yy28;
+yy59:
+	if (yybm[0+yych] & 128) {
+		goto yy58;
+	}
+	if (yych >= '(') goto yy55;
 	++YYCURSOR;
 	{ handle_val(STD_ARGS, 1, '\''); goto state_next_arg_begin; }
 }
diff -Nru php8.2-8.2.29/ext/standard/var_unserializer.c php8.2-8.2.30/ext/standard/var_unserializer.c
--- php8.2-8.2.29/ext/standard/var_unserializer.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/standard/var_unserializer.c	2025-12-16 17:18:12.000000000 +0000
@@ -1,4 +1,4 @@
-/* Generated by re2c 4.0 */
+/* Generated by re2c 2.0.3 */
 /*
   +----------------------------------------------------------------------+
   | Copyright (c) The PHP Group                                          |
@@ -892,330 +892,334 @@
 
 {
 	YYCTYPE yych;
-	static const unsigned char yybm[256] = {
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0
+	static const unsigned char yybm[] = {
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		128, 128, 128, 128, 128, 128, 128, 128, 
+		128, 128,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
+		  0,   0,   0,   0,   0,   0,   0,   0, 
 	};
 	if ((YYLIMIT - YYCURSOR) < 7) YYFILL(7);
 	yych = *YYCURSOR;
 	switch (yych) {
-		case 'C':
-		case 'O': goto yy3;
-		case 'E': goto yy4;
-		case 'N': goto yy5;
-		case 'R': goto yy6;
-		case 'S': goto yy7;
-		case 'a': goto yy8;
-		case 'b': goto yy9;
-		case 'd': goto yy10;
-		case 'i': goto yy11;
-		case 'r': goto yy12;
-		case 's': goto yy13;
-		case '}': goto yy14;
-		default: goto yy1;
+	case 'C':
+	case 'O':	goto yy4;
+	case 'E':	goto yy5;
+	case 'N':	goto yy6;
+	case 'R':	goto yy7;
+	case 'S':	goto yy8;
+	case 'a':	goto yy9;
+	case 'b':	goto yy10;
+	case 'd':	goto yy11;
+	case 'i':	goto yy12;
+	case 'r':	goto yy13;
+	case 's':	goto yy14;
+	case '}':	goto yy15;
+	default:	goto yy2;
 	}
-yy1:
-	++YYCURSOR;
 yy2:
-	{ return 0; }
+	++YYCURSOR;
 yy3:
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy15;
-	goto yy2;
+	{ return 0; }
 yy4:
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych == ':') goto yy17;
-	goto yy2;
+	goto yy3;
 yy5:
-	yych = *++YYCURSOR;
-	if (yych == ';') goto yy18;
-	goto yy2;
-yy6:
 	yych = *(YYMARKER = ++YYCURSOR);
 	if (yych == ':') goto yy19;
-	goto yy2;
+	goto yy3;
+yy6:
+	yych = *++YYCURSOR;
+	if (yych == ';') goto yy20;
+	goto yy3;
 yy7:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy20;
-	goto yy2;
+	if (yych == ':') goto yy22;
+	goto yy3;
 yy8:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy21;
-	goto yy2;
+	if (yych == ':') goto yy23;
+	goto yy3;
 yy9:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy22;
-	goto yy2;
+	if (yych == ':') goto yy24;
+	goto yy3;
 yy10:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy23;
-	goto yy2;
+	if (yych == ':') goto yy25;
+	goto yy3;
 yy11:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy24;
-	goto yy2;
+	if (yych == ':') goto yy26;
+	goto yy3;
 yy12:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy25;
-	goto yy2;
+	if (yych == ':') goto yy27;
+	goto yy3;
 yy13:
 	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == ':') goto yy26;
-	goto yy2;
+	if (yych == ':') goto yy28;
+	goto yy3;
 yy14:
+	yych = *(YYMARKER = ++YYCURSOR);
+	if (yych == ':') goto yy29;
+	goto yy3;
+yy15:
 	++YYCURSOR;
 	{
 	/* this is the case where we have less data than planned */
 	php_error_docref(NULL, E_NOTICE, "Unexpected end of serialized data");
 	return 0; /* not sure if it should be 0 or 1 here? */
 }
-yy15:
-	yych = *++YYCURSOR;
-	if (yybm[0+yych] & 128) goto yy27;
-yy16:
-	YYCURSOR = YYMARKER;
-	goto yy2;
 yy17:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy28;
-	goto yy16;
+	if (yybm[0+yych] & 128) {
+		goto yy30;
+	}
 yy18:
+	YYCURSOR = YYMARKER;
+	goto yy3;
+yy19:
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy32;
+	goto yy18;
+yy20:
 	++YYCURSOR;
 	{
 	*p = YYCURSOR;
 	ZVAL_NULL(rval);
 	return 1;
 }
-yy19:
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy29;
-	goto yy16;
-yy20:
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy30;
-	goto yy16;
-yy21:
-	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy31;
-	goto yy16;
 yy22:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '0') goto yy32;
-	if (yych <= '1') goto yy33;
-	goto yy16;
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy34;
+	goto yy18;
 yy23:
 	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy36;
+	goto yy18;
+yy24:
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy38;
+	goto yy18;
+yy25:
+	yych = *++YYCURSOR;
+	if (yych <= '/') goto yy18;
+	if (yych <= '0') goto yy40;
+	if (yych <= '1') goto yy41;
+	goto yy18;
+yy26:
+	yych = *++YYCURSOR;
 	if (yych <= '/') {
 		if (yych <= ',') {
-			if (yych == '+') goto yy34;
-			goto yy16;
+			if (yych == '+') goto yy42;
+			goto yy18;
 		} else {
-			if (yych <= '-') goto yy35;
-			if (yych <= '.') goto yy36;
-			goto yy16;
+			if (yych <= '-') goto yy43;
+			if (yych <= '.') goto yy44;
+			goto yy18;
 		}
 	} else {
 		if (yych <= 'I') {
-			if (yych <= '9') goto yy37;
-			if (yych <= 'H') goto yy16;
-			goto yy38;
+			if (yych <= '9') goto yy45;
+			if (yych <= 'H') goto yy18;
+			goto yy47;
 		} else {
-			if (yych == 'N') goto yy39;
-			goto yy16;
+			if (yych == 'N') goto yy48;
+			goto yy18;
 		}
 	}
-yy24:
+yy27:
 	yych = *++YYCURSOR;
 	if (yych <= ',') {
-		if (yych == '+') goto yy40;
-		goto yy16;
+		if (yych == '+') goto yy49;
+		goto yy18;
 	} else {
-		if (yych <= '-') goto yy40;
-		if (yych <= '/') goto yy16;
-		if (yych <= '9') goto yy41;
-		goto yy16;
+		if (yych <= '-') goto yy49;
+		if (yych <= '/') goto yy18;
+		if (yych <= '9') goto yy50;
+		goto yy18;
 	}
-yy25:
+yy28:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy42;
-	goto yy16;
-yy26:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy52;
+	goto yy18;
+yy29:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy43;
-	goto yy16;
-yy27:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy54;
+	goto yy18;
+yy30:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	if (yybm[0+yych] & 128) goto yy27;
-	if (yych <= '/') goto yy16;
-	if (yych <= ':') goto yy44;
-	goto yy16;
-yy28:
+	if (yybm[0+yych] & 128) {
+		goto yy30;
+	}
+	if (yych <= '/') goto yy18;
+	if (yych <= ':') goto yy56;
+	goto yy18;
+yy32:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy28;
-	if (yych <= ':') goto yy45;
-	goto yy16;
-yy29:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy32;
+	if (yych <= ':') goto yy57;
+	goto yy18;
+yy34:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy29;
-	if (yych == ';') goto yy46;
-	goto yy16;
-yy30:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy34;
+	if (yych == ';') goto yy58;
+	goto yy18;
+yy36:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy30;
-	if (yych <= ':') goto yy47;
-	goto yy16;
-yy31:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy36;
+	if (yych <= ':') goto yy60;
+	goto yy18;
+yy38:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy31;
-	if (yych <= ':') goto yy48;
-	goto yy16;
-yy32:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy38;
+	if (yych <= ':') goto yy61;
+	goto yy18;
+yy40:
 	yych = *++YYCURSOR;
-	if (yych == ';') goto yy49;
-	goto yy16;
-yy33:
+	if (yych == ';') goto yy62;
+	goto yy18;
+yy41:
 	yych = *++YYCURSOR;
-	if (yych == ';') goto yy50;
-	goto yy16;
-yy34:
+	if (yych == ';') goto yy64;
+	goto yy18;
+yy42:
 	yych = *++YYCURSOR;
-	if (yych == '.') goto yy36;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy37;
-	goto yy16;
-yy35:
+	if (yych == '.') goto yy44;
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy45;
+	goto yy18;
+yy43:
 	yych = *++YYCURSOR;
 	if (yych <= '/') {
-		if (yych != '.') goto yy16;
+		if (yych != '.') goto yy18;
 	} else {
-		if (yych <= '9') goto yy37;
-		if (yych == 'I') goto yy38;
-		goto yy16;
+		if (yych <= '9') goto yy45;
+		if (yych == 'I') goto yy47;
+		goto yy18;
 	}
-yy36:
+yy44:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy51;
-	goto yy16;
-yy37:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy66;
+	goto yy18;
+yy45:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
 	if (yych <= ':') {
 		if (yych <= '.') {
-			if (yych <= '-') goto yy16;
-			goto yy51;
+			if (yych <= '-') goto yy18;
+			goto yy66;
 		} else {
-			if (yych <= '/') goto yy16;
-			if (yych <= '9') goto yy37;
-			goto yy16;
+			if (yych <= '/') goto yy18;
+			if (yych <= '9') goto yy45;
+			goto yy18;
 		}
 	} else {
 		if (yych <= 'E') {
-			if (yych <= ';') goto yy52;
-			if (yych <= 'D') goto yy16;
-			goto yy53;
+			if (yych <= ';') goto yy68;
+			if (yych <= 'D') goto yy18;
+			goto yy70;
 		} else {
-			if (yych == 'e') goto yy53;
-			goto yy16;
+			if (yych == 'e') goto yy70;
+			goto yy18;
 		}
 	}
-yy38:
+yy47:
 	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy54;
-	goto yy16;
-yy39:
+	if (yych == 'N') goto yy71;
+	goto yy18;
+yy48:
 	yych = *++YYCURSOR;
-	if (yych == 'A') goto yy55;
-	goto yy16;
-yy40:
+	if (yych == 'A') goto yy72;
+	goto yy18;
+yy49:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych >= ':') goto yy16;
-yy41:
+	if (yych <= '/') goto yy18;
+	if (yych >= ':') goto yy18;
+yy50:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy41;
-	if (yych == ';') goto yy56;
-	goto yy16;
-yy42:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy50;
+	if (yych == ';') goto yy73;
+	goto yy18;
+yy52:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy42;
-	if (yych == ';') goto yy57;
-	goto yy16;
-yy43:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy52;
+	if (yych == ';') goto yy75;
+	goto yy18;
+yy54:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 2) YYFILL(2);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy43;
-	if (yych <= ':') goto yy58;
-	goto yy16;
-yy44:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy54;
+	if (yych <= ':') goto yy77;
+	goto yy18;
+yy56:
 	yych = *++YYCURSOR;
-	if (yych == '"') goto yy59;
-	goto yy16;
-yy45:
+	if (yych == '"') goto yy78;
+	goto yy18;
+yy57:
 	yych = *++YYCURSOR;
-	if (yych == '"') goto yy60;
-	goto yy16;
-yy46:
+	if (yych == '"') goto yy80;
+	goto yy18;
+yy58:
 	++YYCURSOR;
 	{
 	zend_long id;
@@ -1247,46 +1251,46 @@
 
 	return 1;
 }
-yy47:
+yy60:
 	yych = *++YYCURSOR;
-	if (yych == '"') goto yy61;
-	goto yy16;
-yy48:
+	if (yych == '"') goto yy82;
+	goto yy18;
+yy61:
 	yych = *++YYCURSOR;
-	if (yych == '{') goto yy62;
-	goto yy16;
-yy49:
+	if (yych == '{') goto yy84;
+	goto yy18;
+yy62:
 	++YYCURSOR;
 	{
 	*p = YYCURSOR;
 	ZVAL_FALSE(rval);
 	return 1;
 }
-yy50:
+yy64:
 	++YYCURSOR;
 	{
 	*p = YYCURSOR;
 	ZVAL_TRUE(rval);
 	return 1;
 }
-yy51:
+yy66:
 	++YYCURSOR;
 	if ((YYLIMIT - YYCURSOR) < 3) YYFILL(3);
 	yych = *YYCURSOR;
 	if (yych <= ';') {
-		if (yych <= '/') goto yy16;
-		if (yych <= '9') goto yy51;
-		if (yych <= ':') goto yy16;
+		if (yych <= '/') goto yy18;
+		if (yych <= '9') goto yy66;
+		if (yych <= ':') goto yy18;
 	} else {
 		if (yych <= 'E') {
-			if (yych <= 'D') goto yy16;
-			goto yy53;
+			if (yych <= 'D') goto yy18;
+			goto yy70;
 		} else {
-			if (yych == 'e') goto yy53;
-			goto yy16;
+			if (yych == 'e') goto yy70;
+			goto yy18;
 		}
 	}
-yy52:
+yy68:
 	++YYCURSOR;
 	{
 #if SIZEOF_ZEND_LONG == 4
@@ -1296,26 +1300,26 @@
 	ZVAL_DOUBLE(rval, zend_strtod((const char *)start + 2, NULL));
 	return 1;
 }
-yy53:
+yy70:
 	yych = *++YYCURSOR;
 	if (yych <= ',') {
-		if (yych == '+') goto yy63;
-		goto yy16;
+		if (yych == '+') goto yy86;
+		goto yy18;
 	} else {
-		if (yych <= '-') goto yy63;
-		if (yych <= '/') goto yy16;
-		if (yych <= '9') goto yy64;
-		goto yy16;
-	}
-yy54:
-	yych = *++YYCURSOR;
-	if (yych == 'F') goto yy65;
-	goto yy16;
-yy55:
-	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy65;
-	goto yy16;
-yy56:
+		if (yych <= '-') goto yy86;
+		if (yych <= '/') goto yy18;
+		if (yych <= '9') goto yy87;
+		goto yy18;
+	}
+yy71:
+	yych = *++YYCURSOR;
+	if (yych == 'F') goto yy89;
+	goto yy18;
+yy72:
+	yych = *++YYCURSOR;
+	if (yych == 'N') goto yy89;
+	goto yy18;
+yy73:
 	++YYCURSOR;
 	{
 #if SIZEOF_ZEND_LONG == 4
@@ -1342,7 +1346,7 @@
 	ZVAL_LONG(rval, parse_iv(start + 2));
 	return 1;
 }
-yy57:
+yy75:
 	++YYCURSOR;
 	{
 	zend_long id;
@@ -1368,11 +1372,11 @@
 
 	return 1;
 }
-yy58:
+yy77:
 	yych = *++YYCURSOR;
-	if (yych == '"') goto yy66;
-	goto yy16;
-yy59:
+	if (yych == '"') goto yy90;
+	goto yy18;
+yy78:
 	++YYCURSOR;
 	{
 	size_t len, maxlen;
@@ -1591,7 +1595,7 @@
 
 	return object_common(UNSERIALIZE_PASSTHRU, elements, has_unserialize);
 }
-yy60:
+yy80:
 	++YYCURSOR;
 	{
 	if (!var_hash) return 0;
@@ -1672,7 +1676,7 @@
 	zend_string_release_ex(case_name, 0);
 	return 0;
 }
-yy61:
+yy82:
 	++YYCURSOR;
 	{
 	size_t len, maxlen;
@@ -1707,7 +1711,7 @@
 	ZVAL_STR(rval, str);
 	return 1;
 }
-yy62:
+yy84:
 	++YYCURSOR;
 	{
 	zend_long elements = parse_iv(start + 2);
@@ -1741,23 +1745,23 @@
 
 	return finish_nested_data(UNSERIALIZE_PASSTHRU);
 }
-yy63:
+yy86:
 	yych = *++YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych >= ':') goto yy16;
-yy64:
+	if (yych <= '/') goto yy18;
+	if (yych >= ':') goto yy18;
+yy87:
 	++YYCURSOR;
 	if (YYLIMIT <= YYCURSOR) YYFILL(1);
 	yych = *YYCURSOR;
-	if (yych <= '/') goto yy16;
-	if (yych <= '9') goto yy64;
-	if (yych == ';') goto yy52;
-	goto yy16;
-yy65:
-	yych = *++YYCURSOR;
-	if (yych == ';') goto yy67;
-	goto yy16;
-yy66:
+	if (yych <= '/') goto yy18;
+	if (yych <= '9') goto yy87;
+	if (yych == ';') goto yy68;
+	goto yy18;
+yy89:
+	yych = *++YYCURSOR;
+	if (yych == ';') goto yy92;
+	goto yy18;
+yy90:
 	++YYCURSOR;
 	{
 	size_t len, maxlen;
@@ -1795,7 +1799,7 @@
 	}
 	return 1;
 }
-yy67:
+yy92:
 	++YYCURSOR;
 	{
 	*p = YYCURSOR;
diff -Nru php8.2-8.2.29/ext/xml/compat.c php8.2-8.2.30/ext/xml/compat.c
--- php8.2-8.2.29/ext/xml/compat.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/xml/compat.c	2025-12-16 17:18:12.000000000 +0000
@@ -375,7 +375,9 @@
 		if (ret == NULL)
 			ret = xmlGetDocEntity(parser->parser->myDoc, name);
 
+		ZEND_DIAGNOSTIC_IGNORED_START("-Wdeprecated-declarations")
 		if (ret == NULL || parser->parser->instate == XML_PARSER_CONTENT) {
+		ZEND_DIAGNOSTIC_IGNORED_END
 			if (ret == NULL || ret->etype == XML_INTERNAL_GENERAL_ENTITY || ret->etype == XML_INTERNAL_PARAMETER_ENTITY || ret->etype == XML_INTERNAL_PREDEFINED_ENTITY) {
 				/* Predefined entities will expand unless no cdata handler is present */
 				if (parser->h_default && ! (ret && ret->etype == XML_INTERNAL_PREDEFINED_ENTITY && parser->h_cdata)) {
@@ -709,21 +711,8 @@
 PHP_XML_API int
 XML_GetCurrentByteIndex(XML_Parser parser)
 {
-	/* We have to temporarily disable the encoder to satisfy the note from the manual:
-	 * "This function returns byte index according to UTF-8 encoded text disregarding if input is in another encoding."
-	 * Although that should probably be corrected at one point? (TODO) */
-	xmlCharEncodingHandlerPtr encoder = NULL;
-	xmlParserInputPtr input = parser->parser->input;
-	if (input->buf) {
-		encoder = input->buf->encoder;
-		input->buf->encoder = NULL;
-	}
-	long result = xmlByteConsumed(parser->parser);
-	if (encoder) {
-		input->buf->encoder = encoder;
-	}
-	/* TODO: at one point this should return long probably to make sure that files greater than 2 GiB are handled correctly. */
-	return (int) result;
+	return parser->parser->input->consumed +
+			(parser->parser->input->cur - parser->parser->input->base);
 }
 
 PHP_XML_API int
Binary files /srv/release.debian.org/tmp/f4MbOWeaYs/php8.2-8.2.29/ext/zlib/tests/zlib_flock.txt.gz and /srv/release.debian.org/tmp/aMhZa7W7dI/php8.2-8.2.30/ext/zlib/tests/zlib_flock.txt.gz differ
diff -Nru php8.2-8.2.29/ext/zlib/tests/zlib_wrapper_flock_basic.phpt php8.2-8.2.30/ext/zlib/tests/zlib_wrapper_flock_basic.phpt
--- php8.2-8.2.29/ext/zlib/tests/zlib_wrapper_flock_basic.phpt	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/ext/zlib/tests/zlib_wrapper_flock_basic.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -4,7 +4,7 @@
 zlib
 --FILE--
 <?php
-$f = __DIR__."/004.txt.gz";
+$f = __DIR__."/zlib_flock.txt.gz";
 $h = gzopen($f,'r');
 var_dump(flock($h, LOCK_SH));
 gzclose($h);
diff -Nru php8.2-8.2.29/main/php_config.h.in php8.2-8.2.30/main/php_config.h.in
--- php8.2-8.2.29/main/php_config.h.in	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/main/php_config.h.in	2025-12-16 17:18:12.000000000 +0000
@@ -243,6 +243,11 @@
 /* */
 #undef COOKIE_SEEKER_USES_OFF64_T
 
+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+   systems. This function is required for `alloca.c' support on those systems.
+   */
+#undef CRAY_STACKSEG_END
+
 /* Define if crypt_r has uses CRYPTD */
 #undef CRYPT_R_CRYPTD
 
@@ -252,7 +257,7 @@
 /* Define if crypt_r uses struct crypt_data */
 #undef CRYPT_R_STRUCT_CRYPT_DATA
 
-/* Define to 1 if using 'alloca.c'. */
+/* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
 /* Define if the target system is darwin */
@@ -336,7 +341,7 @@
 /* */
 #undef GDBM_INCLUDE_FILE
 
-/* Define to 1 if 'TIOCGWINSZ' requires <sys/ioctl.h>. */
+/* Define to 1 if `TIOCGWINSZ' requires <sys/ioctl.h>. */
 #undef GWINSZ_IN_SYS_IOCTL
 
 /* Whether 3 arg set_rebind_proc() */
@@ -360,13 +365,14 @@
 /* whether the compiler supports __alignof__ */
 #undef HAVE_ALIGNOF
 
-/* Define to 1 if you have 'alloca', as a function or macro. */
+/* Define to 1 if you have `alloca', as a function or macro. */
 #undef HAVE_ALLOCA
 
-/* Define to 1 if <alloca.h> works. */
+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
+   */
 #undef HAVE_ALLOCA_H
 
-/* Define to 1 if you have the 'alphasort' function. */
+/* Define to 1 if you have the `alphasort' function. */
 #undef HAVE_ALPHASORT
 
 /* AppArmor confinement available */
@@ -381,16 +387,16 @@
 /* Define to 1 if you have the <arpa/nameser.h> header file. */
 #undef HAVE_ARPA_NAMESER_H
 
-/* Define to 1 if you have the 'asctime_r' function. */
+/* Define to 1 if you have the `asctime_r' function. */
 #undef HAVE_ASCTIME_R
 
 /* Define if asm goto support */
 #undef HAVE_ASM_GOTO
 
-/* Define to 1 if you have the 'asprintf' function. */
+/* Define to 1 if you have the `asprintf' function. */
 #undef HAVE_ASPRINTF
 
-/* Define to 1 if you have the 'atoll' function. */
+/* Define to 1 if you have the `atoll' function. */
 #undef HAVE_ATOLL
 
 /* whether the compiler supports __attribute__ ((__aligned__)) */
@@ -429,10 +435,10 @@
 /* */
 #undef HAVE_CAPSTONE
 
-/* Define to 1 if you have the 'chroot' function. */
+/* Define to 1 if you have the `chroot' function. */
 #undef HAVE_CHROOT
 
-/* Define to 1 if you have the 'clearenv' function. */
+/* Define to 1 if you have the `clearenv' function. */
 #undef HAVE_CLEARENV
 
 /* */
@@ -471,7 +477,7 @@
 /* Define to 1 if you have the <cpuid.h> header file. */
 #undef HAVE_CPUID_H
 
-/* Define to 1 if you have the 'CreateProcess' function. */
+/* Define to 1 if you have the `CreateProcess' function. */
 #undef HAVE_CREATEPROCESS
 
 /* */
@@ -483,10 +489,10 @@
 /* */
 #undef HAVE_CRYPT_R
 
-/* Define to 1 if you have the 'ctermid' function. */
+/* Define to 1 if you have the `ctermid' function. */
 #undef HAVE_CTERMID
 
-/* Define to 1 if you have the 'ctime_r' function. */
+/* Define to 1 if you have the `ctime_r' function. */
 #undef HAVE_CTIME_R
 
 /* */
@@ -507,15 +513,15 @@
 /* */
 #undef HAVE_DCNGETTEXT
 
-/* Define to 1 if you have the declaration of 'arc4random_buf', and to 0 if
+/* Define to 1 if you have the declaration of `arc4random_buf', and to 0 if
    you don't. */
 #undef HAVE_DECL_ARC4RANDOM_BUF
 
-/* Define to 1 if you have the declaration of 'strerror_r', and to 0 if you
+/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
    don't. */
 #undef HAVE_DECL_STRERROR_R
 
-/* Define to 1 if you have the declaration of 'tzname', and to 0 if you don't.
+/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
    */
 #undef HAVE_DECL_TZNAME
 
@@ -585,19 +591,19 @@
 /* Whether you want EXIF (metadata from images) support */
 #undef HAVE_EXIF
 
-/* Define to 1 if you have the 'explicit_bzero' function. */
+/* Define to 1 if you have the `explicit_bzero' function. */
 #undef HAVE_EXPLICIT_BZERO
 
-/* Define to 1 if you have the 'explicit_memset' function. */
+/* Define to 1 if you have the `explicit_memset' function. */
 #undef HAVE_EXPLICIT_MEMSET
 
-/* Define to 1 if you have the 'fabsf' function. */
+/* Define to 1 if you have the `fabsf' function. */
 #undef HAVE_FABSF
 
 /* Define to 1 if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
-/* Define to 1 if you have the 'fdatasync' function. */
+/* Define to 1 if you have the `fdatasync' function. */
 #undef HAVE_FDATASYNC
 
 /* Have ffi support */
@@ -624,25 +630,25 @@
 /* Whether libffi supports thiscall calling convention */
 #undef HAVE_FFI_THISCALL
 
-/* Define to 1 if you have the 'flock' function. */
+/* Define to 1 if you have the `flock' function. */
 #undef HAVE_FLOCK
 
-/* Define to 1 if you have the 'floorf' function. */
+/* Define to 1 if you have the `floorf' function. */
 #undef HAVE_FLOORF
 
 /* Define if flush should be called explicitly after a buffered io. */
 #undef HAVE_FLUSHIO
 
-/* Define to 1 if your system has a working POSIX 'fnmatch' function. */
+/* Define to 1 if your system has a working POSIX `fnmatch' function. */
 #undef HAVE_FNMATCH
 
 /* */
 #undef HAVE_FOPENCOOKIE
 
-/* Define to 1 if you have the 'fork' function. */
+/* Define to 1 if you have the `fork' function. */
 #undef HAVE_FORK
 
-/* Define to 1 if you have the 'forkx' function. */
+/* Define to 1 if you have the `forkx' function. */
 #undef HAVE_FORKX
 
 /* do we have acl support? */
@@ -654,7 +660,7 @@
 /* whether FPU control word can be manipulated by inline assembler */
 #undef HAVE_FPU_INLINE_ASM_X86
 
-/* Define to 1 if you have the 'ftok' function. */
+/* Define to 1 if you have the `ftok' function. */
 #undef HAVE_FTOK
 
 /* Whether you want FTP support */
@@ -678,10 +684,10 @@
 /* Define to 1 if you have the six-argument form of gethostbyname_r(). */
 #undef HAVE_FUNC_GETHOSTBYNAME_R_6
 
-/* Define to 1 if you have the 'funopen' function. */
+/* Define to 1 if you have the `funopen' function. */
 #undef HAVE_FUNOPEN
 
-/* Define to 1 if you have the 'gai_strerror' function. */
+/* Define to 1 if you have the `gai_strerror' function. */
 #undef HAVE_GAI_STRERROR
 
 /* Define if the target system has support for global register variables */
@@ -726,16 +732,16 @@
 /* Define if you have the getaddrinfo function */
 #undef HAVE_GETADDRINFO
 
-/* Define to 1 if you have the 'getcwd' function. */
+/* Define to 1 if you have the `getcwd' function. */
 #undef HAVE_GETCWD
 
-/* Define to 1 if you have the 'getgrgid_r' function. */
+/* Define to 1 if you have the `getgrgid_r' function. */
 #undef HAVE_GETGRGID_R
 
-/* Define to 1 if you have the 'getgrnam_r' function. */
+/* Define to 1 if you have the `getgrnam_r' function. */
 #undef HAVE_GETGRNAM_R
 
-/* Define to 1 if you have the 'getgroups' function. */
+/* Define to 1 if you have the `getgroups' function. */
 #undef HAVE_GETGROUPS
 
 /* */
@@ -750,70 +756,70 @@
 /* whether getifaddrs is present and usable */
 #undef HAVE_GETIFADDRS
 
-/* Define to 1 if you have the 'getloadavg' function. */
+/* Define to 1 if you have the `getloadavg' function. */
 #undef HAVE_GETLOADAVG
 
-/* Define to 1 if you have the 'getlogin' function. */
+/* Define to 1 if you have the `getlogin' function. */
 #undef HAVE_GETLOGIN
 
-/* Define to 1 if you have the 'getopt' function. */
+/* Define to 1 if you have the `getopt' function. */
 #undef HAVE_GETOPT
 
-/* Define to 1 if you have the 'getpgid' function. */
+/* Define to 1 if you have the `getpgid' function. */
 #undef HAVE_GETPGID
 
-/* Define to 1 if you have the 'getpid' function. */
+/* Define to 1 if you have the `getpid' function. */
 #undef HAVE_GETPID
 
-/* Define to 1 if you have the 'getpriority' function. */
+/* Define to 1 if you have the `getpriority' function. */
 #undef HAVE_GETPRIORITY
 
-/* Define to 1 if you have the 'getprotobyname' function. */
+/* Define to 1 if you have the `getprotobyname' function. */
 #undef HAVE_GETPROTOBYNAME
 
-/* Define to 1 if you have the 'getprotobynumber' function. */
+/* Define to 1 if you have the `getprotobynumber' function. */
 #undef HAVE_GETPROTOBYNUMBER
 
-/* Define to 1 if you have the 'getpwnam_r' function. */
+/* Define to 1 if you have the `getpwnam_r' function. */
 #undef HAVE_GETPWNAM_R
 
-/* Define to 1 if you have the 'getpwuid_r' function. */
+/* Define to 1 if you have the `getpwuid_r' function. */
 #undef HAVE_GETPWUID_R
 
-/* Define to 1 if you have the 'getrandom' function. */
+/* Define to 1 if you have the `getrandom' function. */
 #undef HAVE_GETRANDOM
 
-/* Define to 1 if you have the 'getrlimit' function. */
+/* Define to 1 if you have the `getrlimit' function. */
 #undef HAVE_GETRLIMIT
 
-/* Define to 1 if you have the 'getrusage' function. */
+/* Define to 1 if you have the `getrusage' function. */
 #undef HAVE_GETRUSAGE
 
-/* Define to 1 if you have the 'getservbyname' function. */
+/* Define to 1 if you have the `getservbyname' function. */
 #undef HAVE_GETSERVBYNAME
 
-/* Define to 1 if you have the 'getservbyport' function. */
+/* Define to 1 if you have the `getservbyport' function. */
 #undef HAVE_GETSERVBYPORT
 
-/* Define to 1 if you have the 'getsid' function. */
+/* Define to 1 if you have the `getsid' function. */
 #undef HAVE_GETSID
 
-/* Define to 1 if you have the 'gettimeofday' function. */
+/* Define to 1 if you have the `gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY
 
-/* Define to 1 if you have the 'getwd' function. */
+/* Define to 1 if you have the `getwd' function. */
 #undef HAVE_GETWD
 
 /* glibc's iconv implementation */
 #undef HAVE_GLIBC_ICONV
 
-/* Define to 1 if you have the 'glob' function. */
+/* Define to 1 if you have the `glob' function. */
 #undef HAVE_GLOB
 
 /* */
 #undef HAVE_GMP
 
-/* Define to 1 if you have the 'gmtime_r' function. */
+/* Define to 1 if you have the `gmtime_r' function. */
 #undef HAVE_GMTIME_R
 
 /* Define to 1 if you have the <grp.h> header file. */
@@ -822,7 +828,7 @@
 /* */
 #undef HAVE_HISTORY_LIST
 
-/* Define to 1 if you have the 'hstrerror' function. */
+/* Define to 1 if you have the `hstrerror' function. */
 #undef HAVE_HSTRERROR
 
 /* */
@@ -843,10 +849,10 @@
 /* Define to 1 if you have the <ieeefp.h> header file. */
 #undef HAVE_IEEEFP_H
 
-/* Define to 1 if you have the 'if_indextoname' function. */
+/* Define to 1 if you have the `if_indextoname' function. */
 #undef HAVE_IF_INDEXTONAME
 
-/* Define to 1 if you have the 'if_nametoindex' function. */
+/* Define to 1 if you have the `if_nametoindex' function. */
 #undef HAVE_IF_NAMETOINDEX
 
 /* */
@@ -879,28 +885,28 @@
 /* */
 #undef HAVE_INET_ATON
 
-/* Define to 1 if you have the 'inet_ntoa' function. */
+/* Define to 1 if you have the `inet_ntoa' function. */
 #undef HAVE_INET_NTOA
 
-/* Define to 1 if you have the 'inet_ntop' function. */
+/* Define to 1 if you have the `inet_ntop' function. */
 #undef HAVE_INET_NTOP
 
-/* Define to 1 if you have the 'inet_pton' function. */
+/* Define to 1 if you have the `inet_pton' function. */
 #undef HAVE_INET_PTON
 
-/* Define to 1 if you have the 'initgroups' function. */
+/* Define to 1 if you have the `initgroups' function. */
 #undef HAVE_INITGROUPS
 
-/* Define to 1 if the system has the type 'int16_t'. */
+/* Define to 1 if the system has the type `int16_t'. */
 #undef HAVE_INT16_T
 
-/* Define to 1 if the system has the type 'int32_t'. */
+/* Define to 1 if the system has the type `int32_t'. */
 #undef HAVE_INT32_T
 
-/* Define to 1 if the system has the type 'int64_t'. */
+/* Define to 1 if the system has the type `int64_t'. */
 #undef HAVE_INT64_T
 
-/* Define to 1 if the system has the type 'int8_t'. */
+/* Define to 1 if the system has the type `int8_t'. */
 #undef HAVE_INT8_T
 
 /* Whether intmax_t is available */
@@ -933,7 +939,7 @@
 /* whether to enable JavaScript Object Serialization support */
 #undef HAVE_JSON
 
-/* Define to 1 if you have the 'kill' function. */
+/* Define to 1 if you have the `kill' function. */
 #undef HAVE_KILL
 
 /* do we have kqueue? */
@@ -942,43 +948,43 @@
 /* Define to 1 if you have the <langinfo.h> header file. */
 #undef HAVE_LANGINFO_H
 
-/* Define to 1 if you have the 'lchown' function. */
+/* Define to 1 if you have the `lchown' function. */
 #undef HAVE_LCHOWN
 
 /* */
 #undef HAVE_LDAP
 
-/* Define to 1 if you have the 'ldap_control_find' function. */
+/* Define to 1 if you have the `ldap_control_find' function. */
 #undef HAVE_LDAP_CONTROL_FIND
 
-/* Define to 1 if you have the 'ldap_extended_operation' function. */
+/* Define to 1 if you have the `ldap_extended_operation' function. */
 #undef HAVE_LDAP_EXTENDED_OPERATION
 
-/* Define to 1 if you have the 'ldap_extended_operation_s' function. */
+/* Define to 1 if you have the `ldap_extended_operation_s' function. */
 #undef HAVE_LDAP_EXTENDED_OPERATION_S
 
-/* Define to 1 if you have the 'ldap_parse_extended_result' function. */
+/* Define to 1 if you have the `ldap_parse_extended_result' function. */
 #undef HAVE_LDAP_PARSE_EXTENDED_RESULT
 
-/* Define to 1 if you have the 'ldap_parse_reference' function. */
+/* Define to 1 if you have the `ldap_parse_reference' function. */
 #undef HAVE_LDAP_PARSE_REFERENCE
 
-/* Define to 1 if you have the 'ldap_parse_result' function. */
+/* Define to 1 if you have the `ldap_parse_result' function. */
 #undef HAVE_LDAP_PARSE_RESULT
 
-/* Define to 1 if you have the 'ldap_passwd' function. */
+/* Define to 1 if you have the `ldap_passwd' function. */
 #undef HAVE_LDAP_PASSWD
 
-/* Define to 1 if you have the 'ldap_refresh_s' function. */
+/* Define to 1 if you have the `ldap_refresh_s' function. */
 #undef HAVE_LDAP_REFRESH_S
 
 /* LDAP SASL support */
 #undef HAVE_LDAP_SASL
 
-/* Define to 1 if you have the 'ldap_start_tls_s' function. */
+/* Define to 1 if you have the `ldap_start_tls_s' function. */
 #undef HAVE_LDAP_START_TLS_S
 
-/* Define to 1 if you have the 'ldap_whoami_s' function. */
+/* Define to 1 if you have the `ldap_whoami_s' function. */
 #undef HAVE_LDAP_WHOAMI_S
 
 /* */
@@ -1020,7 +1026,7 @@
 /* */
 #undef HAVE_LIBJPEG
 
-/* Define to 1 if you have the 'm' library (-lm). */
+/* Define to 1 if you have the `m' library (-lm). */
 #undef HAVE_LIBM
 
 /* Whether you have libmm */
@@ -1038,7 +1044,7 @@
 /* */
 #undef HAVE_LIBPNG
 
-/* Define to 1 if you have the 'pq' library (-lpq). */
+/* Define to 1 if you have the `pq' library (-lpq). */
 #undef HAVE_LIBPQ
 
 /* */
@@ -1080,10 +1086,10 @@
 /* Define to 1 if you have the <linux/sock_diag.h> header file. */
 #undef HAVE_LINUX_SOCK_DIAG_H
 
-/* Define to 1 if you have the 'localtime_r' function. */
+/* Define to 1 if you have the `localtime_r' function. */
 #undef HAVE_LOCALTIME_R
 
-/* Define to 1 if the system has the type 'long double'. */
+/* Define to 1 if the system has the type `long double'. */
 #undef HAVE_LONG_DOUBLE
 
 /* do we have SO_LISTENQxxx? */
@@ -1098,7 +1104,7 @@
 /* do we have mach_vm_read? */
 #undef HAVE_MACH_VM_READ
 
-/* Define to 1 if you have the 'makedev' function. */
+/* Define to 1 if you have the `makedev' function. */
 #undef HAVE_MAKEDEV
 
 /* Define to 1 if you have the <malloc.h> header file. */
@@ -1110,40 +1116,40 @@
 /* whether to have multibyte string support */
 #undef HAVE_MBSTRING
 
-/* Define to 1 if you have the 'memcntl' function. */
+/* Define to 1 if you have the `memcntl' function. */
 #undef HAVE_MEMCNTL
 
-/* Define to 1 if you have the 'memmem' function. */
+/* Define to 1 if you have the `memmem' function. */
 #undef HAVE_MEMMEM
 
-/* Define to 1 if you have the 'memmove' function. */
+/* Define to 1 if you have the `memmove' function. */
 #undef HAVE_MEMMOVE
 
-/* Define to 1 if you have the 'memrchr' function. */
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `memrchr' function. */
 #undef HAVE_MEMRCHR
 
 /* Libzip >= 1.7.0 with zip_*_method_supported functions */
 #undef HAVE_METHOD_SUPPORTED
 
-/* Define to 1 if you have the <minix/config.h> header file. */
-#undef HAVE_MINIX_CONFIG_H
-
-/* Define to 1 if you have the 'mkfifo' function. */
+/* Define to 1 if you have the `mkfifo' function. */
 #undef HAVE_MKFIFO
 
-/* Define to 1 if you have the 'mknod' function. */
+/* Define to 1 if you have the `mknod' function. */
 #undef HAVE_MKNOD
 
-/* Define to 1 if you have the 'mkstemp' function. */
+/* Define to 1 if you have the `mkstemp' function. */
 #undef HAVE_MKSTEMP
 
-/* Define to 1 if you have the 'mmap' function. */
+/* Define to 1 if you have the `mmap' function. */
 #undef HAVE_MMAP
 
-/* Define to 1 if you have the 'mprotect' function. */
+/* Define to 1 if you have the `mprotect' function. */
 #undef HAVE_MPROTECT
 
-/* Define to 1 if you have the 'mremap' function. */
+/* Define to 1 if you have the `mremap' function. */
 #undef HAVE_MREMAP
 
 /* Whether you have MySQL */
@@ -1167,10 +1173,10 @@
 /* */
 #undef HAVE_NGETTEXT
 
-/* Define to 1 if you have the 'nice' function. */
+/* Define to 1 if you have the `nice' function. */
 #undef HAVE_NICE
 
-/* Define to 1 if you have the 'nl_langinfo' function. */
+/* Define to 1 if you have the `nl_langinfo' function. */
 #undef HAVE_NL_LANGINFO
 
 /* Define to 1 if you have the <nmmintrin.h> header file. */
@@ -1261,7 +1267,7 @@
 /* */
 #undef HAVE_PHP_SESSION
 
-/* Define to 1 if you have the 'poll' function. */
+/* Define to 1 if you have the `poll' function. */
 #undef HAVE_POLL
 
 /* Define to 1 if you have the <poll.h> header file. */
@@ -1291,7 +1297,7 @@
 /* Define to 1 if the PS_STRINGS thing exists. */
 #undef HAVE_PS_STRINGS
 
-/* Define to 1 if you have the 'pthread_jit_write_protect_np' function. */
+/* Define to 1 if you have the `pthread_jit_write_protect_np' function. */
 #undef HAVE_PTHREAD_JIT_WRITE_PROTECT_NP
 
 /* do we have ptrace? */
@@ -1303,7 +1309,7 @@
 /* Define to 1 if you have the <pty.h> header file. */
 #undef HAVE_PTY_H
 
-/* Define to 1 if you have the 'putenv' function. */
+/* Define to 1 if you have the `putenv' function. */
 #undef HAVE_PUTENV
 
 /* Define to 1 if you have the <pwd.h> header file. */
@@ -1312,7 +1318,7 @@
 /* */
 #undef HAVE_PWRITE
 
-/* Define to 1 if you have the 'RAND_egd' function. */
+/* Define to 1 if you have the `RAND_egd' function. */
 #undef HAVE_RAND_EGD
 
 /* Define to 1 if you have the <resolv.h> header file. */
@@ -1330,7 +1336,7 @@
 /* */
 #undef HAVE_RFC822_OUTPUT_ADDRESS_LIST
 
-/* Define to 1 if you have the 'rfork' function. */
+/* Define to 1 if you have the `rfork' function. */
 #undef HAVE_RFORK
 
 /* */
@@ -1348,7 +1354,7 @@
 /* Whether you have sockaddr_storage.ss_family */
 #undef HAVE_SA_SS_FAMILY
 
-/* Define to 1 if you have the 'scandir' function. */
+/* Define to 1 if you have the `scandir' function. */
 #undef HAVE_SCANDIR
 
 /* do we have select? */
@@ -1363,34 +1369,34 @@
 /* */
 #undef HAVE_SEMUN
 
-/* Define to 1 if you have the 'setegid' function. */
+/* Define to 1 if you have the `setegid' function. */
 #undef HAVE_SETEGID
 
-/* Define to 1 if you have the 'setenv' function. */
+/* Define to 1 if you have the `setenv' function. */
 #undef HAVE_SETENV
 
-/* Define to 1 if you have the 'seteuid' function. */
+/* Define to 1 if you have the `seteuid' function. */
 #undef HAVE_SETEUID
 
-/* Define to 1 if you have the 'setitimer' function. */
+/* Define to 1 if you have the `setitimer' function. */
 #undef HAVE_SETITIMER
 
 /* do we have setpflags? */
 #undef HAVE_SETPFLAGS
 
-/* Define to 1 if you have the 'setpriority' function. */
+/* Define to 1 if you have the `setpriority' function. */
 #undef HAVE_SETPRIORITY
 
-/* Define to 1 if you have the 'setproctitle' function. */
+/* Define to 1 if you have the `setproctitle' function. */
 #undef HAVE_SETPROCTITLE
 
-/* Define to 1 if you have the 'setproctitle_fast' function. */
+/* Define to 1 if you have the `setproctitle_fast' function. */
 #undef HAVE_SETPROCTITLE_FAST
 
-/* Define to 1 if you have the 'setrlimit' function. */
+/* Define to 1 if you have the `setrlimit' function. */
 #undef HAVE_SETRLIMIT
 
-/* Define to 1 if you have the 'setsid' function. */
+/* Define to 1 if you have the `setsid' function. */
 #undef HAVE_SETSID
 
 /* */
@@ -1414,25 +1420,25 @@
 /* */
 #undef HAVE_SHM_OPEN
 
-/* Define to 1 if you have the 'shutdown' function. */
+/* Define to 1 if you have the `shutdown' function. */
 #undef HAVE_SHUTDOWN
 
 /* */
 #undef HAVE_SHUTDOWN_SNMP_LOGGING
 
-/* Define to 1 if you have the 'sigaction' function. */
+/* Define to 1 if you have the `sigaction' function. */
 #undef HAVE_SIGACTION
 
-/* Define to 1 if you have the 'sigprocmask' function. */
+/* Define to 1 if you have the `sigprocmask' function. */
 #undef HAVE_SIGPROCMASK
 
-/* Define to 1 if you have the 'sigsetjmp' function. */
+/* Define to 1 if you have the `sigsetjmp' function. */
 #undef HAVE_SIGSETJMP
 
-/* Define to 1 if you have the 'sigtimedwait' function. */
+/* Define to 1 if you have the `sigtimedwait' function. */
 #undef HAVE_SIGTIMEDWAIT
 
-/* Define to 1 if you have the 'sigwaitinfo' function. */
+/* Define to 1 if you have the `sigwaitinfo' function. */
 #undef HAVE_SIGWAITINFO
 
 /* */
@@ -1471,7 +1477,7 @@
 /* */
 #undef HAVE_SOCKETS
 
-/* Define to 1 if the system has the type 'socklen_t'. */
+/* Define to 1 if the system has the type `socklen_t'. */
 #undef HAVE_SOCKLEN_T
 
 /* */
@@ -1522,28 +1528,25 @@
 /* Whether ssize_t is available */
 #undef HAVE_SSIZE_T
 
-/* Define to 1 if you have the 'statfs' function. */
+/* Define to 1 if you have the `statfs' function. */
 #undef HAVE_STATFS
 
-/* Define to 1 if you have the 'statvfs' function. */
+/* Define to 1 if you have the `statvfs' function. */
 #undef HAVE_STATVFS
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
-/* Define to 1 if you have the <stdio.h> header file. */
-#undef HAVE_STDIO_H
-
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* Define to 1 if you have the 'std_syslog' function. */
+/* Define to 1 if you have the `std_syslog' function. */
 #undef HAVE_STD_SYSLOG
 
-/* Define to 1 if you have the 'strcasecmp' function. */
+/* Define to 1 if you have the `strcasecmp' function. */
 #undef HAVE_STRCASECMP
 
-/* Define if you have 'strerror_r'. */
+/* Define to 1 if you have the `strerror_r' function. */
 #undef HAVE_STRERROR_R
 
 /* Define to 1 if you have the <strings.h> header file. */
@@ -1552,53 +1555,53 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the 'strlcat' function. */
+/* Define to 1 if you have the `strlcat' function. */
 #undef HAVE_STRLCAT
 
-/* Define to 1 if you have the 'strlcpy' function. */
+/* Define to 1 if you have the `strlcpy' function. */
 #undef HAVE_STRLCPY
 
-/* Define to 1 if you have the 'strndup' function. */
+/* Define to 1 if you have the `strndup' function. */
 #undef HAVE_STRNDUP
 
-/* Define to 1 if you have the 'strnlen' function. */
+/* Define to 1 if you have the `strnlen' function. */
 #undef HAVE_STRNLEN
 
-/* Define to 1 if you have the 'strptime' function. */
+/* Define to 1 if you have the `strptime' function. */
 #undef HAVE_STRPTIME
 
 /* whether strptime() declaration fails */
 #undef HAVE_STRPTIME_DECL_FAILS
 
-/* Define to 1 if you have the 'strtok_r' function. */
+/* Define to 1 if you have the `strtok_r' function. */
 #undef HAVE_STRTOK_R
 
-/* Define to 1 if you have the 'strtoll' function. */
+/* Define to 1 if you have the `strtoll' function. */
 #undef HAVE_STRTOLL
 
 /* whether you have struct flock */
 #undef HAVE_STRUCT_FLOCK
 
-/* Define to 1 if 'st_blksize' is a 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 a 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 a 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_gmtoff' is a member of 'struct tm'. */
+/* Define to 1 if `tm_gmtoff' is a member of `struct tm'. */
 #undef HAVE_STRUCT_TM_TM_GMTOFF
 
-/* Define to 1 if 'tm_zone' is a 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_blocks'. Deprecated, use
-   'HAVE_STRUCT_STAT_ST_BLOCKS' instead. */
+/* Define to 1 if your `struct stat' has `st_blocks'. Deprecated, use
+   `HAVE_STRUCT_STAT_ST_BLOCKS' instead. */
 #undef HAVE_ST_BLOCKS
 
-/* Define to 1 if you have the 'symlink' function. */
+/* Define to 1 if you have the `symlink' function. */
 #undef HAVE_SYMLINK
 
 /* do we have sysconf? */
@@ -1742,33 +1745,33 @@
 /* Define to 1 if you have the <tmmintrin.h> header file. */
 #undef HAVE_TMMINTRIN_H
 
-/* Define to 1 if your 'struct tm' has 'tm_zone'. Deprecated, use
-   'HAVE_STRUCT_TM_TM_ZONE' instead. */
+/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
+   `HAVE_STRUCT_TM_TM_ZONE' instead. */
 #undef HAVE_TM_ZONE
 
 /* Whether you have a working ttyname_r */
 #undef HAVE_TTYNAME_R
 
-/* Define to 1 if you don't have 'tm_zone' but do have the external array
-   'tzname'. */
+/* Define to 1 if you don't have `tm_zone' but do have the external array
+   `tzname'. */
 #undef HAVE_TZNAME
 
-/* Define to 1 if you have the 'tzset' function. */
+/* Define to 1 if you have the `tzset' function. */
 #undef HAVE_TZSET
 
 /* */
 #undef HAVE_UDBCEXT_H
 
-/* Define to 1 if the system has the type 'uint16_t'. */
+/* Define to 1 if the system has the type `uint16_t'. */
 #undef HAVE_UINT16_T
 
-/* Define to 1 if the system has the type 'uint32_t'. */
+/* Define to 1 if the system has the type `uint32_t'. */
 #undef HAVE_UINT32_T
 
-/* Define to 1 if the system has the type 'uint64_t'. */
+/* Define to 1 if the system has the type `uint64_t'. */
 #undef HAVE_UINT64_T
 
-/* Define to 1 if the system has the type 'uint8_t'. */
+/* Define to 1 if the system has the type `uint8_t'. */
 #undef HAVE_UINT8_T
 
 /* Define to 1 if you have the <unistd.h> header file. */
@@ -1780,10 +1783,10 @@
 /* Define to 1 if you have the <unix.h> header file. */
 #undef HAVE_UNIX_H
 
-/* Define to 1 if you have the 'unsetenv' function. */
+/* Define to 1 if you have the `unsetenv' function. */
 #undef HAVE_UNSETENV
 
-/* Define to 1 if you have the 'unshare' function. */
+/* Define to 1 if you have the `unshare' function. */
 #undef HAVE_UNSHARE
 
 /* */
@@ -1793,13 +1796,13 @@
    userfaultfd */
 #undef HAVE_USERFAULTFD_WRITEFAULT
 
-/* Define to 1 if you have the 'usleep' function. */
+/* Define to 1 if you have the `usleep' function. */
 #undef HAVE_USLEEP
 
-/* Define to 1 if you have the 'utime' function. */
+/* Define to 1 if you have the `utime' function. */
 #undef HAVE_UTIME
 
-/* Define to 1 if you have the 'utimes' function. */
+/* Define to 1 if you have the `utimes' function. */
 #undef HAVE_UTIMES
 
 /* Define to 1 if you have the <utime.h> header file. */
@@ -1811,21 +1814,18 @@
 /* */
 #undef HAVE_VALGRIND
 
-/* Define to 1 if you have the 'vasprintf' function. */
+/* Define to 1 if you have the `vasprintf' function. */
 #undef HAVE_VASPRINTF
 
-/* Define to 1 if you have the 'wait3' function. */
+/* Define to 1 if you have the `wait3' function. */
 #undef HAVE_WAIT3
 
-/* Define to 1 if you have the 'wait4' function. */
+/* Define to 1 if you have the `wait4' function. */
 #undef HAVE_WAIT4
 
-/* Define to 1 if you have the 'waitpid' function. */
+/* Define to 1 if you have the `waitpid' function. */
 #undef HAVE_WAITPID
 
-/* Define to 1 if you have the <wchar.h> header file. */
-#undef HAVE_WCHAR_H
-
 /* Define to 1 if you have the <wmmintrin.h> header file. */
 #undef HAVE_WMMINTRIN_H
 
@@ -2069,28 +2069,28 @@
 /* */
 #undef QDBM_INCLUDE_FILE
 
-/* The size of 'int', as computed by sizeof. */
+/* The size of `int', as computed by sizeof. */
 #undef SIZEOF_INT
 
 /* Size of intmax_t */
 #undef SIZEOF_INTMAX_T
 
-/* The size of 'long', as computed by sizeof. */
+/* The size of `long', as computed by sizeof. */
 #undef SIZEOF_LONG
 
-/* The size of 'long long', as computed by sizeof. */
+/* The size of `long long', as computed by sizeof. */
 #undef SIZEOF_LONG_LONG
 
-/* The size of 'off_t', as computed by sizeof. */
+/* The size of `off_t', as computed by sizeof. */
 #undef SIZEOF_OFF_T
 
 /* Size of ptrdiff_t */
 #undef SIZEOF_PTRDIFF_T
 
-/* The size of 'short', as computed by sizeof. */
+/* The size of `short', as computed by sizeof. */
 #undef SIZEOF_SHORT
 
-/* The size of 'size_t', as computed by sizeof. */
+/* The size of `size_t', as computed by sizeof. */
 #undef SIZEOF_SIZE_T
 
 /* Size of ssize_t */
@@ -2113,9 +2113,7 @@
 	STACK_DIRECTION = 0 => direction of growth unknown */
 #undef STACK_DIRECTION
 
-/* Define to 1 if all of the C89 standard headers exist (not just the ones
-   required in a freestanding environment). This macro is provided for
-   backward compatibility; new code need not use it. */
+/* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
 /* Define to 1 if strerror_r returns char *. */
@@ -2124,7 +2122,7 @@
 /* */
 #undef TCADB_INCLUDE_FILE
 
-/* Define to 1 if your <sys/time.h> declares 'struct tm'. */
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
 #undef TM_IN_SYS_TIME
 
 /* */
@@ -2136,95 +2134,25 @@
 /* Use system default cipher list instead of hardcoded value */
 #undef USE_OPENSSL_SYSTEM_CIPHERS
 
-/* Enable extensions on AIX, Interix, z/OS.  */
+/* Enable extensions on AIX 3, Interix.  */
 #ifndef _ALL_SOURCE
 # undef _ALL_SOURCE
 #endif
-/* Enable general extensions on macOS.  */
-#ifndef _DARWIN_C_SOURCE
-# undef _DARWIN_C_SOURCE
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# undef __EXTENSIONS__
-#endif
 /* Enable GNU extensions on systems that have them.  */
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
-/* Enable X/Open compliant socket functions that do not require linking
-   with -lxnet on HP-UX 11.11.  */
-#ifndef _HPUX_ALT_XOPEN_SOCKET_API
-# undef _HPUX_ALT_XOPEN_SOCKET_API
-#endif
-/* Identify the host operating system as Minix.
-   This macro does not affect the system headers' behavior.
-   A future release of Autoconf may stop defining this macro.  */
-#ifndef _MINIX
-# undef _MINIX
-#endif
-/* Enable general extensions on NetBSD.
-   Enable NetBSD compatibility extensions on Minix.  */
-#ifndef _NETBSD_SOURCE
-# undef _NETBSD_SOURCE
-#endif
-/* Enable OpenBSD compatibility extensions on NetBSD.
-   Oddly enough, this does nothing on OpenBSD.  */
-#ifndef _OPENBSD_SOURCE
-# undef _OPENBSD_SOURCE
-#endif
-/* Define to 1 if needed for POSIX-compatible behavior.  */
-#ifndef _POSIX_SOURCE
-# undef _POSIX_SOURCE
-#endif
-/* Define to 2 if needed for POSIX-compatible behavior.  */
-#ifndef _POSIX_1_SOURCE
-# undef _POSIX_1_SOURCE
-#endif
-/* Enable POSIX-compatible threading on Solaris.  */
+/* Enable threading extensions on Solaris.  */
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
 #endif
-/* Enable extensions specified by ISO/IEC TS 18661-5:2014.  */
-#ifndef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
-# undef __STDC_WANT_IEC_60559_ATTRIBS_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TS 18661-1:2014.  */
-#ifndef __STDC_WANT_IEC_60559_BFP_EXT__
-# undef __STDC_WANT_IEC_60559_BFP_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TS 18661-2:2015.  */
-#ifndef __STDC_WANT_IEC_60559_DFP_EXT__
-# undef __STDC_WANT_IEC_60559_DFP_EXT__
-#endif
-/* Enable extensions specified by C23 Annex F.  */
-#ifndef __STDC_WANT_IEC_60559_EXT__
-# undef __STDC_WANT_IEC_60559_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TS 18661-4:2015.  */
-#ifndef __STDC_WANT_IEC_60559_FUNCS_EXT__
-# undef __STDC_WANT_IEC_60559_FUNCS_EXT__
-#endif
-/* Enable extensions specified by C23 Annex H and ISO/IEC TS 18661-3:2015.  */
-#ifndef __STDC_WANT_IEC_60559_TYPES_EXT__
-# undef __STDC_WANT_IEC_60559_TYPES_EXT__
-#endif
-/* Enable extensions specified by ISO/IEC TR 24731-2:2010.  */
-#ifndef __STDC_WANT_LIB_EXT2__
-# undef __STDC_WANT_LIB_EXT2__
-#endif
-/* Enable extensions specified by ISO/IEC 24747:2009.  */
-#ifndef __STDC_WANT_MATH_SPEC_FUNCS__
-# undef __STDC_WANT_MATH_SPEC_FUNCS__
-#endif
 /* Enable extensions on HP NonStop.  */
 #ifndef _TANDEM_SOURCE
 # undef _TANDEM_SOURCE
 #endif
-/* Enable X/Open extensions.  Define to 500 only if necessary
-   to make mbstate_t available.  */
-#ifndef _XOPEN_SOURCE
-# undef _XOPEN_SOURCE
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
 #endif
 
 
@@ -2258,28 +2186,38 @@
 /* */
 #undef ZTS
 
+/* 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
+
 /* */
 #undef _XOPEN_SOURCE
 
 /* Define when using musl libc */
 #undef __MUSL__
 
-/* Define as 'int' if <sys/types.h> doesn't define. */
+/* Define to `int' if <sys/types.h> doesn't define. */
 #undef gid_t
 
 /* */
 #undef in_addr_t
 
-/* Define to '__inline__' or '__inline' if that's what the C compiler
+/* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
 #ifndef __cplusplus
 #undef inline
 #endif
 
-/* Define as 'unsigned int' if <stddef.h> doesn't define. */
+/* Define to `unsigned int' if <sys/types.h> does not define. */
 #undef size_t
 
-/* Define as 'int' if <sys/types.h> doesn't define. */
+/* Define to `int' if <sys/types.h> doesn't define. */
 #undef uid_t
 
 
diff -Nru php8.2-8.2.29/main/php_version.h php8.2-8.2.30/main/php_version.h
--- php8.2-8.2.29/main/php_version.h	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/main/php_version.h	2025-12-16 17:18:12.000000000 +0000
@@ -2,7 +2,7 @@
 /* edit configure.ac to change version number */
 #define PHP_MAJOR_VERSION 8
 #define PHP_MINOR_VERSION 2
-#define PHP_RELEASE_VERSION 29
+#define PHP_RELEASE_VERSION 30
 #define PHP_EXTRA_VERSION ""
-#define PHP_VERSION "8.2.29"
-#define PHP_VERSION_ID 80229
+#define PHP_VERSION "8.2.30"
+#define PHP_VERSION_ID 80230
diff -Nru php8.2-8.2.29/run-extra-tests.php php8.2-8.2.30/run-extra-tests.php
--- php8.2-8.2.29/run-extra-tests.php	1970-01-01 00:00:00.000000000 +0000
+++ php8.2-8.2.30/run-extra-tests.php	2025-12-16 17:18:12.000000000 +0000
@@ -0,0 +1,123 @@
+#!/usr/bin/env php
+<?php
+/*
+   +----------------------------------------------------------------------+
+   | Copyright (c) The PHP Group                                          |
+   +----------------------------------------------------------------------+
+   | 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:           |
+   | https://www.php.net/license/3_01.txt                                 |
+   | 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          |
+   | license@php.net so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+ */
+
+/* This is a single entrypoint for non-phpt tests. */
+
+class Environment
+{
+    public function __construct(
+        public string $os,
+        public string $cpuArch,
+        public bool $zts,
+        public bool $debug,
+        public bool $githubAction,
+    ) {}
+}
+
+function show_usage(): void
+{
+    echo <<<HELP
+    Synopsis:
+        php run-extra-tests.php
+
+    Environment variables:
+        TEST_PHP_OS:       One of 'Windows NT', 'Linux', 'FreeBSD', 'Darwin'
+        TEST_PHP_CPU_ARCH: One of 'x86', 'x86_64', 'aarch64'
+
+    HELP;
+}
+
+function main(int $argc, array $argv): void
+{
+    if ($argc !== 1) {
+        show_usage();
+        exit(1);
+    }
+
+    $environment = new Environment(
+        detect_os(),
+        detect_cpu_arch(),
+        PHP_ZTS,
+        PHP_DEBUG,
+        getenv('GITHUB_ACTIONS') === 'true',
+    );
+
+    echo "=====================================================================\n";
+    echo "OS:       {$environment->os}\n";
+    echo "CPU Arch: {$environment->cpuArch}\n";
+    echo "ZTS:      " . ($environment->zts ? 'Yes' : 'No') . "\n";
+    echo "DEBUG:    " . ($environment->debug ? 'Yes' : 'No') . "\n";
+    echo "=====================================================================\n";
+
+    echo "No tests in this branch yet.\n";
+
+    echo "All OK\n";
+}
+
+function output_group_start(Environment $environment, string $name): void
+{
+    if ($environment->githubAction) {
+        printf("::group::%s\n", $name);
+    } else {
+        printf("%s\n", $name);
+    }
+}
+
+function output_group_end(Environment $environment): void
+{
+    if ($environment->githubAction) {
+        printf("::endgroup::\n");
+    }
+}
+
+/**
+ * Returns getenv('TEST_PHP_OS') if defined, otherwise returns one of
+ * 'Windows NT', 'Linux', 'FreeBSD', 'Darwin', ...
+ */
+function detect_os(): string
+{
+    $os = (string) getenv('TEST_PHP_OS');
+    if ($os !== '') {
+        return $os;
+    }
+
+    return php_uname('s');
+}
+
+/**
+ * Returns getenv('TEST_PHP_CPU_ARCH') if defined, otherwise returns one of
+ * 'x86', 'x86_64', 'aarch64', ...
+ */
+function detect_cpu_arch(): string
+{
+    $cpu = (string) getenv('TEST_PHP_CPU_ARCH');
+    if ($cpu !== '') {
+        return $cpu;
+    }
+
+    $cpu = php_uname('m');
+    if (strtolower($cpu) === 'amd64') {
+        $cpu = 'x86_64';
+    } else if (in_array($cpu, ['i386', 'i686'])) {
+        $cpu = 'x86';
+    } else if ($cpu === 'arm64') {
+        $cpu = 'aarch64';
+    }
+
+    return $cpu;
+}
+
+main($argc, $argv);
diff -Nru php8.2-8.2.29/run-tests.php php8.2-8.2.30/run-tests.php
--- php8.2-8.2.29/run-tests.php	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/run-tests.php	2025-12-16 17:18:12.000000000 +0000
@@ -23,7 +23,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: 5add428aaddc5c974be0ec4111efe187d846717d $ */
+/* $Id: 8dacaf5989572a162a322174a94059e245d6032c $ */
 
 /* Temporary variables while this file is being refactored. */
 /** @var ?JUnit */
@@ -612,7 +612,7 @@
                     $show_progress = false;
                     break;
                 case '--version':
-                    echo '$Id: 5add428aaddc5c974be0ec4111efe187d846717d $' . "\n";
+                    echo '$Id: 8dacaf5989572a162a322174a94059e245d6032c $' . "\n";
                     exit(1);
 
                 default:
@@ -2812,6 +2812,11 @@
     if ($test->hasSection('FLAKY')) {
         return true;
     }
+    if ($test->hasSection('SKIPIF')) {
+        if (strpos($test->getSection('SKIPIF'), 'SKIP_PERF_SENSITIVE') !== false) {
+            return true;
+        }
+    }
     if (!$test->hasSection('FILE')) {
         return false;
     }
diff -Nru php8.2-8.2.29/sapi/fpm/fpm/fpm_php_trace.c php8.2-8.2.30/sapi/fpm/fpm/fpm_php_trace.c
--- php8.2-8.2.29/sapi/fpm/fpm/fpm_php_trace.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/sapi/fpm/fpm/fpm_php_trace.c	2025-12-16 17:18:12.000000000 +0000
@@ -39,15 +39,14 @@
 	int callers_limit = child->wp->config->request_slowlog_trace_depth;
 	pid_t pid = child->pid;
 	struct timeval tv;
-	static const int buf_size = 1024;
-	char buf[buf_size];
+	char buf[1024];
 	long execute_data;
 	long path_translated;
 	long l;
 
 	gettimeofday(&tv, 0);
 
-	zlog_print_time(&tv, buf, buf_size);
+	zlog_print_time(&tv, buf, sizeof(buf));
 
 	fprintf(slowlog, "\n%s [pool %s] pid %d\n", buf, child->wp->config->name, (int) pid);
 
@@ -57,7 +56,7 @@
 
 	path_translated = l;
 
-	if (0 > fpm_trace_get_strz(buf, buf_size, path_translated)) {
+	if (0 > fpm_trace_get_strz(buf, sizeof(buf), path_translated)) {
 		return -1;
 	}
 
@@ -103,7 +102,7 @@
 					ZEND_UNREACHABLE();
 				}
 			} else {
-				if (0 > fpm_trace_get_strz(buf, buf_size, function_name + offsetof(zend_string, val))) {
+				if (0 > fpm_trace_get_strz(buf, sizeof(buf), function_name + offsetof(zend_string, val))) {
 					return -1;
 				}
 
@@ -149,7 +148,7 @@
 
 				file_name = l;
 
-				if (0 > fpm_trace_get_strz(buf, buf_size, file_name + offsetof(zend_string, val))) {
+				if (0 > fpm_trace_get_strz(buf, sizeof(buf), file_name + offsetof(zend_string, val))) {
 					return -1;
 				}
 
diff -Nru php8.2-8.2.29/sapi/fpm/fpm/fpm_stdio.c php8.2-8.2.30/sapi/fpm/fpm/fpm_stdio.c
--- php8.2-8.2.29/sapi/fpm/fpm/fpm_stdio.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/sapi/fpm/fpm/fpm_stdio.c	2025-12-16 17:18:12.000000000 +0000
@@ -168,9 +168,8 @@
 
 static void fpm_stdio_child_said(struct fpm_event_s *ev, short which, void *arg) /* {{{ */
 {
-	static const int max_buf_size = 1024;
 	int fd = ev->fd;
-	char buf[max_buf_size];
+	char buf[1024];
 	struct fpm_child_s *child;
 	int is_stdout;
 	struct fpm_event_s *event;
@@ -216,7 +215,7 @@
 
 	while (1) {
 stdio_read:
-		in_buf = read(fd, buf, max_buf_size - 1);
+		in_buf = read(fd, buf, sizeof(buf) - 1);
 		if (in_buf <= 0) { /* no data */
 			if (in_buf == 0 || !PHP_IS_TRANSIENT_ERROR(errno)) {
 				/* pipe is closed or error */
diff -Nru php8.2-8.2.29/sapi/fpm/tests/bug68591-conf-test-group.phpt php8.2-8.2.30/sapi/fpm/tests/bug68591-conf-test-group.phpt
--- php8.2-8.2.29/sapi/fpm/tests/bug68591-conf-test-group.phpt	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/sapi/fpm/tests/bug68591-conf-test-group.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -3,6 +3,7 @@
 --SKIPIF--
 <?php
 include "skipif.inc";
+if (getenv("SKIP_ASAN") && getenv("GITHUB_ACTIONS")) die("skip leak sanitizer crashes");
 ?>
 --FILE--
 <?php
diff -Nru php8.2-8.2.29/sapi/fpm/tests/bug68591-conf-test-user.phpt php8.2-8.2.30/sapi/fpm/tests/bug68591-conf-test-user.phpt
--- php8.2-8.2.29/sapi/fpm/tests/bug68591-conf-test-user.phpt	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/sapi/fpm/tests/bug68591-conf-test-user.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -3,6 +3,7 @@
 --SKIPIF--
 <?php
 include "skipif.inc";
+if (getenv("SKIP_ASAN") && getenv("GITHUB_ACTIONS")) die("skip leak sanitizer crashes");
 ?>
 --FILE--
 <?php
diff -Nru php8.2-8.2.29/sapi/fpm/tests/bug74083-concurrent-reload.phpt php8.2-8.2.30/sapi/fpm/tests/bug74083-concurrent-reload.phpt
--- php8.2-8.2.29/sapi/fpm/tests/bug74083-concurrent-reload.phpt	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/sapi/fpm/tests/bug74083-concurrent-reload.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -4,6 +4,7 @@
 <?php
 include "skipif.inc";
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin") die("skip Potential cause for GitHub Actions crash");
 ?>
 --FILE--
 <?php
diff -Nru php8.2-8.2.29/sapi/fpm/tests/bug76601-reload-child-signals.phpt php8.2-8.2.30/sapi/fpm/tests/bug76601-reload-child-signals.phpt
--- php8.2-8.2.29/sapi/fpm/tests/bug76601-reload-child-signals.phpt	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/sapi/fpm/tests/bug76601-reload-child-signals.phpt	2025-12-16 17:18:12.000000000 +0000
@@ -4,6 +4,7 @@
 <?php
 include "skipif.inc";
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
+if (getenv("GITHUB_ACTIONS") && PHP_OS_FAMILY === "Darwin") die("skip Potential cause for GitHub Actions crash");
 ?>
 --FILE--
 <?php
diff -Nru php8.2-8.2.29/sapi/phpdbg/phpdbg_lexer.c php8.2-8.2.30/sapi/phpdbg/phpdbg_lexer.c
--- php8.2-8.2.29/sapi/phpdbg/phpdbg_lexer.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/sapi/phpdbg/phpdbg_lexer.c	2025-12-16 17:18:12.000000000 +0000
@@ -1,4 +1,4 @@
-/* Generated by re2c 4.0 */
+/* Generated by re2c 2.0.3 */
 /*
  * phpdbg_lexer.l
  */
@@ -66,195 +66,104 @@
 {
 	YYCTYPE yych;
 	unsigned int yyaccept = 0;
-	static const unsigned char yybm_NORMAL[512] = {
-		  0,  62,  62,  62,  62,  62,  62,  62,
-		 62,  40,   0,  62,  62,  40,  62,  62,
-		 62,  62,  62,  62,  62,  62,  62,  62,
-		 62,  62,  62,  62,  62,  62,  62,  62,
-		 40,  62,  50,  40,  62,  62,  62,  14,
-		 62,  62,  62,  62,  62,  62,  63,  62,
-		127, 127, 127, 127, 127, 127, 127, 127,
-		127, 127,  40,  62,  62,  62,  62,  62,
-		 62, 254, 254, 254, 254, 254, 254, 190,
-		190, 190, 190, 190, 190, 190, 190, 190,
-		190, 190, 190, 190, 190, 190, 190, 190,
-		190, 190, 190,  62,   2,  62,  62, 190,
-		 62, 254, 254, 254, 254, 254, 254, 190,
-		190, 190, 190, 190, 190, 190, 190, 190,
-		190, 190, 190, 190, 190, 190, 190, 190,
-		190, 190, 190,  62,  62,  62,  62,  62,
-		 62,  62,  62,  62,  62,  62,  62,  62,
-		 62,  62,  62,  62,  62,  62,  62,  62,
-		 62,  62,  62,  62,  62,  62,  62,  62,
-		 62,  62,  62,  62,  62,  62,  62,  62,
-		 62,  62,  62,  62,  62,  62,  62,  62,
-		 62,  62,  62,  62,  62,  62,  62,  62,
-		 62,  62,  62,  62,  62,  62,  62,  62,
-		 62,  62,  62,  62,  62,  62,  62,  62,
-		 62,  62,  62,  62,  62,  62,  62,  62,
-		 62,  62,  62,  62,  62,  62,  62,  62,
-		 62,  62,  62,  62,  62,  62,  62,  62,
-		 62,  62,  62,  62,  62,  62,  62,  62,
-		 62,  62,  62,  62,  62,  62,  62,  62,
-		 62,  62,  62,  62,  62,  62,  62,  62,
-		 62,  62,  62,  62,  62,  62,  62,  62,
-		 62,  62,  62,  62,  62,  62,  62,  62,
-		  0,  64,  64,  64,  64,  64,  64,  64,
-		 64, 128,   0,  64,  64, 128,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		128,  64,   0,   0,  64,  64,  64,   0,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,   0,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64,
-		 64,  64,  64,  64,  64,  64,  64,  64
-	};
-	static const unsigned char yybm_PRE_RAW[256] = {
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,  64,   0,   0,   0,  64,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		 64,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0, 128,   0,
-		128, 128, 128, 128, 128, 128, 128, 128,
-		128, 128,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0
-	};
-	static const unsigned char yybm_RAW[256] = {
-		  0, 247, 247, 247, 247, 247, 247, 247,
-		247, 247,   0, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 148,  70, 247, 247, 247, 162,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247,   8, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247,
-		247, 247, 247, 247, 247, 247, 247, 247
-	};
-	static const unsigned char yybm_INITIAL[256] = {
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0, 128,   0,   0,   0, 128,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		128,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0,
-		  0,   0,   0,   0,   0,   0,   0,   0
-	};
 	if (YYGETCONDITION() < 2) {
-		if (YYGETCONDITION() < 1) goto yyc_NORMAL;
-		else goto yyc_PRE_RAW;
+		if (YYGETCONDITION() < 1) {
+			goto yyc_NORMAL;
+		} else {
+			goto yyc_PRE_RAW;
+		}
 	} else {
-		if (YYGETCONDITION() < 3) goto yyc_RAW;
-		else goto yyc_INITIAL;
+		if (YYGETCONDITION() < 3) {
+			goto yyc_RAW;
+		} else {
+			goto yyc_INITIAL;
+		}
 	}
 /* *********************************** */
 yyc_NORMAL:
-	YYFILL(11);
-	yych = *YYCURSOR;
-	YYDEBUG(0, yych);
-	if (yybm_NORMAL[256+yych] & 128) goto yy5;
-	switch (yych) {
+	{
+		static const unsigned char yybm[] = {
+			/* table 1 .. 8: 0 */
+			  0,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  40,   0,  62,  62,  40,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 40,  62,  50,  40,  62,  62,  62,  14, 
+			 62,  62,  62,  62,  62,  62,  63,  62, 
+			127, 127, 127, 127, 127, 127, 127, 127, 
+			127, 127,  40,  62,  62,  62,  62,  62, 
+			 62, 254, 254, 254, 254, 254, 254, 190, 
+			190, 190, 190, 190, 190, 190, 190, 190, 
+			190, 190, 190, 190, 190, 190, 190, 190, 
+			190, 190, 190,  62,   2,  62,  62, 190, 
+			 62, 254, 254, 254, 254, 254, 254, 190, 
+			190, 190, 190, 190, 190, 190, 190, 190, 
+			190, 190, 190, 190, 190, 190, 190, 190, 
+			190, 190, 190,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			 62,  62,  62,  62,  62,  62,  62,  62, 
+			/* table 9 .. 10: 256 */
+			  0,  64,  64,  64,  64,  64,  64,  64, 
+			 64, 128,   0,  64,  64, 128,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			128,  64,   0,   0,  64,  64,  64,   0, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,   0,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+			 64,  64,  64,  64,  64,  64,  64,  64, 
+		};
+		YYDEBUG(0, *YYCURSOR);
+		YYFILL(11);
+		yych = *YYCURSOR;
+		if (yybm[256+yych] & 128) {
+			goto yy7;
+		}
+		switch (yych) {
 		case 0x00:
 		case '\t':
-		case '\n': goto yy1;
-		case '"': goto yy6;
-		case '#': goto yy8;
-		case '\'': goto yy10;
-		case '-': goto yy11;
+		case '\n':	goto yy2;
+		case '"':	goto yy10;
+		case '#':	goto yy12;
+		case '\'':	goto yy14;
+		case '-':	goto yy15;
 		case '.':
 		case '1':
 		case '2':
@@ -264,1458 +173,1689 @@
 		case '6':
 		case '7':
 		case '8':
-		case '9': goto yy12;
-		case '0': goto yy14;
-		case ':': goto yy15;
+		case '9':	goto yy16;
+		case '0':	goto yy19;
+		case ':':	goto yy20;
 		case 'D':
-		case 'd': goto yy16;
+		case 'd':	goto yy21;
 		case 'E':
-		case 'e': goto yy17;
+		case 'e':	goto yy22;
 		case 'F':
-		case 'f': goto yy18;
+		case 'f':	goto yy23;
 		case 'I':
-		case 'i': goto yy19;
+		case 'i':	goto yy24;
 		case 'N':
-		case 'n': goto yy20;
+		case 'n':	goto yy25;
 		case 'O':
-		case 'o': goto yy21;
+		case 'o':	goto yy26;
 		case 'T':
-		case 't': goto yy22;
+		case 't':	goto yy27;
 		case 'Y':
-		case 'y': goto yy23;
-		case 'Z': goto yy24;
-		case 'z': goto yy25;
-		default: goto yy2;
-	}
-yy1:
-	YYDEBUG(1, yych);
-	++YYCURSOR;
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+		case 'y':	goto yy28;
+		case 'Z':	goto yy29;
+		case 'z':	goto yy30;
+		default:	goto yy4;
+		}
+yy2:
+		YYDEBUG(2, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(3, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	return 0;
 }
-yy2:
-	YYDEBUG(2, yych);
-	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
-yy3:
-	YYDEBUG(3, yych);
-	if (yybm_NORMAL[256+yych] & 64) goto yy2;
-	if (yych <= ' ') goto yy4;
-	if (yych == '#') goto yy4;
-	if (yych <= '\'') goto yy26;
-	goto yy28;
 yy4:
-	YYDEBUG(4, yych);
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+		YYDEBUG(4, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
+yy5:
+		YYDEBUG(5, *YYCURSOR);
+		if (yybm[256+yych] & 64) {
+			goto yy4;
+		}
+		if (yych <= ' ') goto yy6;
+		if (yych == '#') goto yy6;
+		if (yych <= '\'') goto yy31;
+		goto yy33;
+yy6:
+		YYDEBUG(6, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	phpdbg_init_param(yylval, STR_PARAM);
 	yylval->str = estrndup(yytext, yyleng - unescape_string(yytext));
 	yylval->len = yyleng;
 	return T_ID;
 }
-yy5:
-	YYDEBUG(5, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_NORMAL[256+yych] & 128) goto yy5;
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy7:
+		YYDEBUG(7, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(8, *YYCURSOR);
+		if (yybm[256+yych] & 128) {
+			goto yy7;
+		}
+		YYDEBUG(9, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	/* ignore whitespace */
 
 	goto restart;
 }
-yy6:
-	YYDEBUG(6, yych);
-	yych = *++YYCURSOR;
-	if (yych == '"') goto yy26;
-	goto yy30;
-yy7:
-	YYDEBUG(7, yych);
-	YYCURSOR = YYMARKER;
-	if (yyaccept <= 3) {
-		if (yyaccept <= 1) {
-			if (yyaccept == 0) goto yy4;
-			else goto yy9;
-		} else {
-			if (yyaccept == 2) goto yy13;
-			else goto yy71;
-		}
-	} else {
-		if (yyaccept <= 5) {
-			if (yyaccept == 4) goto yy73;
-			else goto yy85;
+yy10:
+		YYDEBUG(10, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '"') goto yy31;
+		goto yy35;
+yy11:
+		YYDEBUG(11, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		if (yyaccept <= 3) {
+			if (yyaccept <= 1) {
+				if (yyaccept == 0) {
+					goto yy6;
+				} else {
+					goto yy13;
+				}
+			} else {
+				if (yyaccept == 2) {
+					goto yy18;
+				} else {
+					goto yy82;
+				}
+			}
 		} else {
-			goto yy100;
-		}
-	}
-yy8:
-	YYDEBUG(8, yych);
-	yyaccept = 1;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '.') {
-		if (yych <= ',') goto yy9;
-		if (yych <= '-') {
-			YYCTXMARKER = YYCURSOR;
-			goto yy35;
+			if (yyaccept <= 5) {
+				if (yyaccept == 4) {
+					goto yy85;
+				} else {
+					goto yy101;
+				}
+			} else {
+				goto yy118;
+			}
 		}
-		YYCTXMARKER = YYCURSOR;
-		goto yy36;
-	} else {
-		if (yych <= '/') goto yy9;
-		if (yych <= '9') {
+yy12:
+		YYDEBUG(12, *YYCURSOR);
+		yyaccept = 1;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '.') {
+			if (yych <= ',') goto yy13;
+			if (yych <= '-') {
+				YYCTXMARKER = YYCURSOR;
+				goto yy40;
+			}
 			YYCTXMARKER = YYCURSOR;
-			goto yy36;
+			goto yy41;
+		} else {
+			if (yych <= '/') goto yy13;
+			if (yych <= '9') {
+				YYCTXMARKER = YYCURSOR;
+				goto yy41;
+			}
 		}
-	}
-yy9:
-	YYDEBUG(9, yych);
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy13:
+		YYDEBUG(13, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	YYSETCONDITION(INITIAL);
 	return T_SEPARATOR;
 }
-yy10:
-	YYDEBUG(10, yych);
-	yych = *++YYCURSOR;
-	if (yych == '\'') goto yy26;
-	goto yy39;
-yy11:
-	YYDEBUG(11, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_NORMAL[0+yych] & 1) goto yy12;
-	if (yych == 'r') goto yy44;
-	goto yy3;
-yy12:
-	YYDEBUG(12, yych);
-	yyaccept = 2;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
-	if (yybm_NORMAL[0+yych] & 1) goto yy12;
-	if (yych <= ' ') {
-		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy13;
-			if (yych <= 0x08) goto yy2;
-		} else {
-			if (yych == '\r') goto yy13;
-			if (yych <= 0x1F) goto yy2;
+yy14:
+		YYDEBUG(14, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '\'') goto yy31;
+		goto yy45;
+yy15:
+		YYDEBUG(15, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 1) {
+			goto yy16;
 		}
-	} else {
-		if (yych <= '&') {
-			if (yych <= '!') goto yy2;
-			if (yych <= '"') goto yy26;
-			if (yych >= '$') goto yy2;
-		} else {
-			if (yych <= '\'') goto yy26;
-			if (yych <= '/') goto yy2;
-			if (yych <= ':') goto yy28;
-			goto yy2;
+		if (yych == 'r') goto yy50;
+		goto yy5;
+yy16:
+		YYDEBUG(16, *YYCURSOR);
+		yyaccept = 2;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
+		YYDEBUG(17, *YYCURSOR);
+		if (yybm[0+yych] & 1) {
+			goto yy16;
 		}
-	}
-yy13:
-	YYDEBUG(13, yych);
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+		if (yych <= ' ') {
+			if (yych <= '\n') {
+				if (yych <= 0x00) goto yy18;
+				if (yych <= 0x08) goto yy4;
+			} else {
+				if (yych == '\r') goto yy18;
+				if (yych <= 0x1F) goto yy4;
+			}
+		} else {
+			if (yych <= '&') {
+				if (yych <= '!') goto yy4;
+				if (yych <= '"') goto yy31;
+				if (yych >= '$') goto yy4;
+			} else {
+				if (yych <= '\'') goto yy31;
+				if (yych <= '/') goto yy4;
+				if (yych <= ':') goto yy33;
+				goto yy4;
+			}
+		}
+yy18:
+		YYDEBUG(18, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	phpdbg_init_param(yylval, NUMERIC_PARAM);
 	yylval->num = atoi(yytext);
 	return T_DIGITS;
 }
-yy14:
-	YYDEBUG(14, yych);
-	yyaccept = 2;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_NORMAL[0+yych] & 1) goto yy12;
-	if (yych <= 0x1F) {
-		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy13;
-			if (yych <= 0x08) goto yy3;
-			goto yy13;
-		} else {
-			if (yych == '\r') goto yy13;
-			goto yy3;
-		}
-	} else {
-		if (yych <= '#') {
-			if (yych <= ' ') goto yy13;
-			if (yych <= '"') goto yy3;
-			goto yy13;
+yy19:
+		YYDEBUG(19, *YYCURSOR);
+		yyaccept = 2;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 1) {
+			goto yy16;
+		}
+		if (yych <= 0x1F) {
+			if (yych <= '\n') {
+				if (yych <= 0x00) goto yy18;
+				if (yych <= 0x08) goto yy5;
+				goto yy18;
+			} else {
+				if (yych == '\r') goto yy18;
+				goto yy5;
+			}
 		} else {
-			if (yych == 'x') goto yy45;
-			goto yy3;
+			if (yych <= '#') {
+				if (yych <= ' ') goto yy18;
+				if (yych <= '"') goto yy5;
+				goto yy18;
+			} else {
+				if (yych == 'x') goto yy51;
+				goto yy5;
+			}
 		}
-	}
-yy15:
-	YYDEBUG(15, yych);
-	yych = *++YYCURSOR;
-	if (yych == ':') goto yy47;
-	if (yych == '\\') goto yy48;
-	goto yy46;
-yy16:
-	YYDEBUG(16, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'I') goto yy49;
-	if (yych == 'i') goto yy49;
-	goto yy3;
-yy17:
-	YYDEBUG(17, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy50;
-	if (yych == 'n') goto yy50;
-	goto yy3;
-yy18:
-	YYDEBUG(18, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy51;
-	if (yych == 'a') goto yy51;
-	goto yy3;
-yy19:
-	YYDEBUG(19, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'F') goto yy52;
-	if (yych == 'f') goto yy52;
-	goto yy3;
 yy20:
-	YYDEBUG(20, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'O') goto yy53;
-	if (yych == 'o') goto yy53;
-	goto yy3;
+		YYDEBUG(20, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == ':') goto yy54;
+		if (yych == '\\') goto yy56;
+		goto yy52;
 yy21:
-	YYDEBUG(21, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 'N') {
-		if (yych == 'F') goto yy54;
-		if (yych <= 'M') goto yy3;
-		goto yy55;
-	} else {
-		if (yych <= 'f') {
-			if (yych <= 'e') goto yy3;
-			goto yy54;
-		} else {
-			if (yych == 'n') goto yy55;
-			goto yy3;
-		}
-	}
+		YYDEBUG(21, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'I') goto yy58;
+		if (yych == 'i') goto yy58;
+		goto yy5;
 yy22:
-	YYDEBUG(22, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'R') goto yy56;
-	if (yych == 'r') goto yy56;
-	goto yy3;
+		YYDEBUG(22, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy59;
+		if (yych == 'n') goto yy59;
+		goto yy5;
 yy23:
-	YYDEBUG(23, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy57;
-	if (yych == 'e') goto yy57;
-	goto yy3;
+		YYDEBUG(23, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy60;
+		if (yych == 'a') goto yy60;
+		goto yy5;
 yy24:
-	YYDEBUG(24, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy58;
-	goto yy3;
+		YYDEBUG(24, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'F') goto yy61;
+		if (yych == 'f') goto yy61;
+		goto yy5;
 yy25:
-	YYDEBUG(25, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'e') goto yy59;
-	goto yy3;
+		YYDEBUG(25, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'O') goto yy62;
+		if (yych == 'o') goto yy62;
+		goto yy5;
 yy26:
-	YYDEBUG(26, yych);
-	++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
+		YYDEBUG(26, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 'N') {
+			if (yych == 'F') goto yy63;
+			if (yych <= 'M') goto yy5;
+			goto yy64;
+		} else {
+			if (yych <= 'f') {
+				if (yych <= 'e') goto yy5;
+				goto yy63;
+			} else {
+				if (yych == 'n') goto yy64;
+				goto yy5;
+			}
+		}
 yy27:
-	YYDEBUG(27, yych);
-	if (yybm_NORMAL[0+yych] & 2) goto yy26;
-	if (yych <= '#') goto yy7;
-	goto yy60;
+		YYDEBUG(27, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'R') goto yy65;
+		if (yych == 'r') goto yy65;
+		goto yy5;
 yy28:
-	YYDEBUG(28, yych);
-	yych = *++YYCURSOR;
-	if (yych == '/') goto yy61;
-	if (yych == '\\') goto yy48;
-	goto yy7;
+		YYDEBUG(28, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy66;
+		if (yych == 'e') goto yy66;
+		goto yy5;
 yy29:
-	YYDEBUG(29, yych);
-	++YYCURSOR;
-	YYFILL(4);
-	yych = *YYCURSOR;
+		YYDEBUG(29, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy67;
+		goto yy5;
 yy30:
-	YYDEBUG(30, yych);
-	if (yybm_NORMAL[0+yych] & 4) goto yy29;
-	if (yych <= ' ') {
-		if (yych <= 0x00) goto yy7;
-		if (yych == '\n') goto yy7;
-	} else {
-		if (yych <= '"') goto yy62;
-		if (yych <= '#') goto yy31;
-		if (yych <= ':') goto yy33;
-		goto yy34;
-	}
+		YYDEBUG(30, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'e') goto yy68;
+		goto yy5;
 yy31:
-	YYDEBUG(31, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
+		YYDEBUG(31, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
 yy32:
-	YYDEBUG(32, yych);
-	if (yybm_NORMAL[0+yych] & 8) goto yy31;
-	if (yych <= '\n') goto yy7;
-	if (yych <= '"') goto yy63;
-	goto yy64;
+		YYDEBUG(32, *YYCURSOR);
+		if (yybm[0+yych] & 2) {
+			goto yy31;
+		}
+		if (yych <= '#') goto yy11;
+		goto yy69;
 yy33:
-	YYDEBUG(33, yych);
-	yych = *++YYCURSOR;
-	if (yych == '/') goto yy65;
-	goto yy32;
+		YYDEBUG(33, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '/') goto yy70;
+		if (yych == '\\') goto yy56;
+		goto yy11;
 yy34:
-	YYDEBUG(34, yych);
-	++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
-	if (yych <= ' ') {
-		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy7;
-			if (yych <= 0x08) goto yy26;
-			goto yy7;
-		} else {
-			if (yych == '\r') goto yy7;
-			if (yych <= 0x1F) goto yy26;
-			goto yy7;
+		YYDEBUG(34, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(4);
+		yych = *YYCURSOR;
+yy35:
+		YYDEBUG(35, *YYCURSOR);
+		if (yybm[0+yych] & 4) {
+			goto yy34;
 		}
-	} else {
-		if (yych <= '9') {
-			if (yych <= '!') goto yy26;
-			if (yych <= '"') goto yy29;
-			if (yych <= '#') goto yy7;
-			goto yy26;
-		} else {
-			if (yych <= ':') goto yy60;
-			if (yych == '\\') goto yy29;
-			goto yy26;
+		if (yych <= ' ') {
+			if (yych <= 0x00) goto yy11;
+			if (yych == '\n') goto yy11;
+		} else {
+			if (yych <= '"') goto yy71;
+			if (yych <= '#') goto yy36;
+			if (yych <= ':') goto yy38;
+			goto yy39;
 		}
-	}
-yy35:
-	YYDEBUG(35, yych);
-	yych = *++YYCURSOR;
-	if (yych == '.') goto yy36;
-	if (yych <= '/') goto yy7;
-	if (yych >= ':') goto yy7;
 yy36:
-	YYDEBUG(36, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '.') goto yy36;
-	if (yych <= '/') goto yy37;
-	if (yych <= '9') goto yy36;
+		YYDEBUG(36, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 yy37:
-	YYDEBUG(37, yych);
-	YYCURSOR = YYCTXMARKER;
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
-	return T_POUND;
-}
+		YYDEBUG(37, *YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy36;
+		}
+		if (yych <= '\n') goto yy11;
+		if (yych <= '"') goto yy72;
+		goto yy73;
 yy38:
-	YYDEBUG(38, yych);
-	++YYCURSOR;
-	YYFILL(4);
-	yych = *YYCURSOR;
+		YYDEBUG(38, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '/') goto yy74;
+		goto yy37;
 yy39:
-	YYDEBUG(39, yych);
-	if (yybm_NORMAL[0+yych] & 16) goto yy38;
-	if (yych <= '\n') {
-		if (yych <= 0x00) goto yy7;
-		if (yych >= '\n') goto yy7;
-	} else {
-		if (yych <= '#') goto yy40;
-		if (yych <= '\'') goto yy62;
-		if (yych <= ':') goto yy42;
-		goto yy43;
-	}
+		YYDEBUG(39, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
+		if (yych <= ' ') {
+			if (yych <= '\n') {
+				if (yych <= 0x00) goto yy11;
+				if (yych <= 0x08) goto yy31;
+				goto yy11;
+			} else {
+				if (yych == '\r') goto yy11;
+				if (yych <= 0x1F) goto yy31;
+				goto yy11;
+			}
+		} else {
+			if (yych <= '9') {
+				if (yych <= '!') goto yy31;
+				if (yych <= '"') goto yy34;
+				if (yych <= '#') goto yy11;
+				goto yy31;
+			} else {
+				if (yych <= ':') goto yy69;
+				if (yych == '\\') goto yy34;
+				goto yy31;
+			}
+		}
 yy40:
-	YYDEBUG(40, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
+		YYDEBUG(40, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '.') goto yy41;
+		if (yych <= '/') goto yy11;
+		if (yych >= ':') goto yy11;
 yy41:
-	YYDEBUG(41, yych);
-	if (yybm_NORMAL[0+yych] & 32) goto yy40;
-	if (yych <= '\n') goto yy7;
-	if (yych <= '\'') goto yy63;
-	goto yy66;
-yy42:
-	YYDEBUG(42, yych);
-	yych = *++YYCURSOR;
-	if (yych == '/') goto yy67;
-	goto yy41;
+		YYDEBUG(41, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(42, *YYCURSOR);
+		if (yych == '.') goto yy41;
+		if (yych <= '/') goto yy43;
+		if (yych <= '9') goto yy41;
 yy43:
-	YYDEBUG(43, yych);
-	++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
-	if (yych <= '"') {
-		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy7;
-			if (yych <= 0x08) goto yy26;
-			if (yych <= '\n') goto yy7;
-			goto yy26;
-		} else {
-			if (yych <= '\r') goto yy7;
-			if (yych == ' ') goto yy7;
-			goto yy26;
-		}
-	} else {
-		if (yych <= '9') {
-			if (yych <= '#') goto yy7;
-			if (yych == '\'') goto yy38;
-			goto yy26;
-		} else {
-			if (yych <= ':') goto yy60;
-			if (yych == '\\') goto yy38;
-			goto yy26;
-		}
-	}
+		YYDEBUG(43, *YYCURSOR);
+		YYCURSOR = YYCTXMARKER;
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
+	return T_POUND;
+}
 yy44:
-	YYDEBUG(44, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= ' ') {
-		if (yych <= '\f') {
-			if (yych == '\t') goto yy68;
-			goto yy3;
-		} else {
-			if (yych <= '\r') goto yy68;
-			if (yych <= 0x1F) goto yy3;
-			goto yy68;
+		YYDEBUG(44, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(4);
+		yych = *YYCURSOR;
+yy45:
+		YYDEBUG(45, *YYCURSOR);
+		if (yybm[0+yych] & 16) {
+			goto yy44;
 		}
-	} else {
-		if (yych <= '.') {
-			if (yych <= ',') goto yy3;
-			if (yych <= '-') goto yy69;
-			goto yy70;
-		} else {
-			if (yych <= '/') goto yy3;
-			if (yych <= '9') goto yy70;
-			goto yy3;
+		if (yych <= '\n') {
+			if (yych <= 0x00) goto yy11;
+			if (yych >= '\n') goto yy11;
+		} else {
+			if (yych <= '#') goto yy46;
+			if (yych <= '\'') goto yy71;
+			if (yych <= ':') goto yy48;
+			goto yy49;
 		}
-	}
-yy45:
-	YYDEBUG(45, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_NORMAL[0+yych] & 64) goto yy72;
-	goto yy3;
 yy46:
-	YYDEBUG(46, yych);
-	++YYCURSOR;
-	YYCURSOR -= 1;
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
-	return T_COLON;
-}
+		YYDEBUG(46, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
 yy47:
-	YYDEBUG(47, yych);
-	++YYCURSOR;
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
-	return T_DCOLON;
-}
+		YYDEBUG(47, *YYCURSOR);
+		if (yybm[0+yych] & 32) {
+			goto yy46;
+		}
+		if (yych <= '\n') goto yy11;
+		if (yych <= '\'') goto yy72;
+		goto yy75;
 yy48:
-	YYDEBUG(48, yych);
-	yyaccept = 0;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= ' ') {
-		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy4;
-			if (yych <= 0x08) goto yy48;
-			goto yy4;
+		YYDEBUG(48, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '/') goto yy76;
+		goto yy47;
+yy49:
+		YYDEBUG(49, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
+		if (yych <= '"') {
+			if (yych <= '\f') {
+				if (yych <= 0x00) goto yy11;
+				if (yych <= 0x08) goto yy31;
+				if (yych <= '\n') goto yy11;
+				goto yy31;
+			} else {
+				if (yych <= '\r') goto yy11;
+				if (yych == ' ') goto yy11;
+				goto yy31;
+			}
 		} else {
-			if (yych == '\r') goto yy4;
-			if (yych <= 0x1F) goto yy48;
-			goto yy4;
-		}
-	} else {
-		if (yych <= '&') {
-			if (yych <= '!') goto yy48;
-			if (yych <= '#') goto yy4;
-			goto yy48;
-		} else {
-			if (yych <= '\'') goto yy4;
-			if (yych == ':') goto yy74;
-			goto yy48;
+			if (yych <= '9') {
+				if (yych <= '#') goto yy11;
+				if (yych == '\'') goto yy44;
+				goto yy31;
+			} else {
+				if (yych <= ':') goto yy69;
+				if (yych == '\\') goto yy44;
+				goto yy31;
+			}
 		}
-	}
-yy49:
-	YYDEBUG(49, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy75;
-	if (yych == 's') goto yy75;
-	goto yy3;
 yy50:
-	YYDEBUG(50, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy76;
-	if (yych == 'a') goto yy76;
-	goto yy3;
+		YYDEBUG(50, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= ' ') {
+			if (yych <= '\f') {
+				if (yych == '\t') goto yy77;
+				goto yy5;
+			} else {
+				if (yych <= '\r') goto yy77;
+				if (yych <= 0x1F) goto yy5;
+				goto yy77;
+			}
+		} else {
+			if (yych <= '.') {
+				if (yych <= ',') goto yy5;
+				if (yych <= '-') goto yy79;
+				goto yy80;
+			} else {
+				if (yych <= '/') goto yy5;
+				if (yych <= '9') goto yy80;
+				goto yy5;
+			}
+		}
 yy51:
-	YYDEBUG(51, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy77;
-	if (yych == 'l') goto yy77;
-	goto yy3;
+		YYDEBUG(51, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy83;
+		}
+		goto yy5;
 yy52:
-	YYDEBUG(52, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '\f') {
-		if (yych == '\t') goto yy78;
-		goto yy3;
-	} else {
-		if (yych <= '\r') goto yy78;
-		if (yych == ' ') goto yy78;
-		goto yy3;
-	}
-yy53:
-	YYDEBUG(53, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '\f') {
-		if (yych <= 0x00) goto yy79;
-		if (yych <= 0x08) goto yy3;
-		if (yych <= '\n') goto yy79;
-		goto yy3;
-	} else {
-		if (yych <= '\r') goto yy79;
-		if (yych == ' ') goto yy79;
-		goto yy3;
-	}
+		YYDEBUG(52, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(53, *YYCURSOR);
+		YYCURSOR -= 1;
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
+	return T_COLON;
+}
 yy54:
-	YYDEBUG(54, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'F') goto yy53;
-	if (yych == 'f') goto yy53;
-	goto yy3;
-yy55:
-	YYDEBUG(55, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '\f') {
-		if (yych <= 0x00) goto yy80;
-		if (yych <= 0x08) goto yy3;
-		if (yych <= '\n') goto yy80;
-		goto yy3;
-	} else {
-		if (yych <= '\r') goto yy80;
-		if (yych == ' ') goto yy80;
-		goto yy3;
-	}
+		YYDEBUG(54, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(55, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
+	return T_DCOLON;
+}
 yy56:
-	YYDEBUG(56, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'U') goto yy81;
-	if (yych == 'u') goto yy81;
-	goto yy3;
-yy57:
-	YYDEBUG(57, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy55;
-	if (yych == 's') goto yy55;
-	goto yy3;
+		YYDEBUG(56, *YYCURSOR);
+		yyaccept = 0;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(57, *YYCURSOR);
+		if (yych <= ' ') {
+			if (yych <= '\n') {
+				if (yych <= 0x00) goto yy6;
+				if (yych <= 0x08) goto yy56;
+				goto yy6;
+			} else {
+				if (yych == '\r') goto yy6;
+				if (yych <= 0x1F) goto yy56;
+				goto yy6;
+			}
+		} else {
+			if (yych <= '&') {
+				if (yych <= '!') goto yy56;
+				if (yych <= '#') goto yy6;
+				goto yy56;
+			} else {
+				if (yych <= '\'') goto yy6;
+				if (yych == ':') goto yy86;
+				goto yy56;
+			}
+		}
 yy58:
-	YYDEBUG(58, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'N') goto yy82;
-	goto yy3;
+		YYDEBUG(58, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy87;
+		if (yych == 's') goto yy87;
+		goto yy5;
 yy59:
-	YYDEBUG(59, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'n') goto yy83;
-	goto yy3;
+		YYDEBUG(59, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy88;
+		if (yych == 'a') goto yy88;
+		goto yy5;
 yy60:
-	YYDEBUG(60, yych);
-	yych = *++YYCURSOR;
-	if (yych != '/') goto yy7;
+		YYDEBUG(60, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy89;
+		if (yych == 'l') goto yy89;
+		goto yy5;
 yy61:
-	YYDEBUG(61, yych);
-	yych = *++YYCURSOR;
-	if (yych == '/') goto yy84;
-	goto yy7;
-yy62:
-	YYDEBUG(62, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= '\r') {
-		if (yych <= 0x08) {
-			if (yych <= 0x00) goto yy4;
-			goto yy27;
+		YYDEBUG(61, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\f') {
+			if (yych == '\t') goto yy90;
+			goto yy5;
 		} else {
-			if (yych <= '\n') goto yy4;
-			if (yych <= '\f') goto yy27;
-			goto yy4;
+			if (yych <= '\r') goto yy90;
+			if (yych == ' ') goto yy90;
+			goto yy5;
 		}
-	} else {
-		if (yych <= ' ') {
-			if (yych <= 0x1F) goto yy27;
-			goto yy4;
-		} else {
-			if (yych == '#') goto yy4;
-			goto yy27;
+yy62:
+		YYDEBUG(62, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\f') {
+			if (yych <= 0x00) goto yy93;
+			if (yych <= 0x08) goto yy5;
+			if (yych <= '\n') goto yy93;
+			goto yy5;
+		} else {
+			if (yych <= '\r') goto yy93;
+			if (yych == ' ') goto yy93;
+			goto yy5;
 		}
-	}
 yy63:
-	YYDEBUG(63, yych);
-	++YYCURSOR;
-	goto yy4;
+		YYDEBUG(63, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'F') goto yy62;
+		if (yych == 'f') goto yy62;
+		goto yy5;
 yy64:
-	YYDEBUG(64, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '"') goto yy31;
-	if (yych == '\\') goto yy31;
-	goto yy7;
+		YYDEBUG(64, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\f') {
+			if (yych <= 0x00) goto yy95;
+			if (yych <= 0x08) goto yy5;
+			if (yych <= '\n') goto yy95;
+			goto yy5;
+		} else {
+			if (yych <= '\r') goto yy95;
+			if (yych == ' ') goto yy95;
+			goto yy5;
+		}
 yy65:
-	YYDEBUG(65, yych);
-	yych = *++YYCURSOR;
-	if (yych == '/') goto yy86;
-	goto yy32;
+		YYDEBUG(65, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'U') goto yy97;
+		if (yych == 'u') goto yy97;
+		goto yy5;
 yy66:
-	YYDEBUG(66, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '\'') goto yy40;
-	if (yych == '\\') goto yy40;
-	goto yy7;
+		YYDEBUG(66, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy64;
+		if (yych == 's') goto yy64;
+		goto yy5;
 yy67:
-	YYDEBUG(67, yych);
-	yych = *++YYCURSOR;
-	if (yych == '/') goto yy87;
-	goto yy41;
+		YYDEBUG(67, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'N') goto yy98;
+		goto yy5;
 yy68:
-	YYDEBUG(68, yych);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yych <= ' ') {
-		if (yych <= '\f') {
-			if (yych == '\t') goto yy68;
-			goto yy7;
+		YYDEBUG(68, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'n') goto yy99;
+		goto yy5;
+yy69:
+		YYDEBUG(69, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych != '/') goto yy11;
+yy70:
+		YYDEBUG(70, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '/') goto yy100;
+		goto yy11;
+yy71:
+		YYDEBUG(71, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= '\r') {
+			if (yych <= 0x08) {
+				if (yych <= 0x00) goto yy6;
+				goto yy32;
+			} else {
+				if (yych <= '\n') goto yy6;
+				if (yych <= '\f') goto yy32;
+				goto yy6;
+			}
 		} else {
-			if (yych <= '\r') goto yy68;
-			if (yych <= 0x1F) goto yy7;
-			goto yy68;
+			if (yych <= ' ') {
+				if (yych <= 0x1F) goto yy32;
+				goto yy6;
+			} else {
+				if (yych == '#') goto yy6;
+				goto yy32;
+			}
 		}
-	} else {
-		if (yych <= '.') {
-			if (yych <= ',') goto yy7;
-			if (yych <= '-') goto yy88;
-			goto yy89;
+yy72:
+		YYDEBUG(72, *YYCURSOR);
+		++YYCURSOR;
+		goto yy6;
+yy73:
+		YYDEBUG(73, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych == '"') goto yy36;
+		if (yych == '\\') goto yy36;
+		goto yy11;
+yy74:
+		YYDEBUG(74, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '/') goto yy102;
+		goto yy37;
+yy75:
+		YYDEBUG(75, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych == '\'') goto yy46;
+		if (yych == '\\') goto yy46;
+		goto yy11;
+yy76:
+		YYDEBUG(76, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '/') goto yy103;
+		goto yy47;
+yy77:
+		YYDEBUG(77, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(78, *YYCURSOR);
+		if (yych <= ' ') {
+			if (yych <= '\f') {
+				if (yych == '\t') goto yy77;
+				goto yy11;
+			} else {
+				if (yych <= '\r') goto yy77;
+				if (yych <= 0x1F) goto yy11;
+				goto yy77;
+			}
 		} else {
-			if (yych <= '/') goto yy7;
-			if (yych <= '9') goto yy89;
-			goto yy7;
-		}
-	}
-yy69:
-	YYDEBUG(69, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '.') goto yy70;
-	if (yych <= '/') goto yy3;
-	if (yych >= ':') goto yy3;
-yy70:
-	YYDEBUG(70, yych);
-	yyaccept = 3;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
-	if (yych <= '"') {
-		if (yych <= '\f') {
-			if (yych <= 0x00) goto yy71;
-			if (yych <= 0x08) goto yy2;
-			if (yych >= '\v') goto yy2;
-		} else {
-			if (yych <= 0x1F) {
-				if (yych >= 0x0E) goto yy2;
-			} else {
-				if (yych <= ' ') goto yy71;
-				if (yych <= '!') goto yy2;
-				goto yy26;
+			if (yych <= '.') {
+				if (yych <= ',') goto yy11;
+				if (yych <= '-') goto yy104;
+				goto yy105;
+			} else {
+				if (yych <= '/') goto yy11;
+				if (yych <= '9') goto yy105;
+				goto yy11;
 			}
 		}
-	} else {
-		if (yych <= '-') {
-			if (yych <= '#') goto yy71;
-			if (yych == '\'') goto yy26;
-			goto yy2;
-		} else {
-			if (yych <= '/') {
-				if (yych <= '.') goto yy70;
-				goto yy2;
-			} else {
-				if (yych <= '9') goto yy70;
-				if (yych <= ':') goto yy28;
-				goto yy2;
+yy79:
+		YYDEBUG(79, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '.') goto yy80;
+		if (yych <= '/') goto yy5;
+		if (yych >= ':') goto yy5;
+yy80:
+		YYDEBUG(80, *YYCURSOR);
+		yyaccept = 3;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
+		YYDEBUG(81, *YYCURSOR);
+		if (yych <= '"') {
+			if (yych <= '\f') {
+				if (yych <= 0x00) goto yy82;
+				if (yych <= 0x08) goto yy4;
+				if (yych >= '\v') goto yy4;
+			} else {
+				if (yych <= 0x1F) {
+					if (yych >= 0x0E) goto yy4;
+				} else {
+					if (yych <= ' ') goto yy82;
+					if (yych <= '!') goto yy4;
+					goto yy31;
+				}
+			}
+		} else {
+			if (yych <= '-') {
+				if (yych <= '#') goto yy82;
+				if (yych == '\'') goto yy31;
+				goto yy4;
+			} else {
+				if (yych <= '/') {
+					if (yych <= '.') goto yy80;
+					goto yy4;
+				} else {
+					if (yych <= '9') goto yy80;
+					if (yych <= ':') goto yy33;
+					goto yy4;
+				}
 			}
 		}
-	}
-yy71:
-	YYDEBUG(71, yych);
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy82:
+		YYDEBUG(82, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	char *text = yytext + 2;
 	while (*++text < '0');
 	yylval->num = atoi(text);
 	return T_REQ_ID;
 }
-yy72:
-	YYDEBUG(72, yych);
-	yyaccept = 4;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
-	if (yybm_NORMAL[0+yych] & 64) goto yy72;
-	if (yych <= ' ') {
-		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy73;
-			if (yych <= 0x08) goto yy2;
-		} else {
-			if (yych == '\r') goto yy73;
-			if (yych <= 0x1F) goto yy2;
+yy83:
+		YYDEBUG(83, *YYCURSOR);
+		yyaccept = 4;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
+		YYDEBUG(84, *YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy83;
 		}
-	} else {
-		if (yych <= '&') {
-			if (yych <= '!') goto yy2;
-			if (yych <= '"') goto yy26;
-			if (yych >= '$') goto yy2;
-		} else {
-			if (yych <= '\'') goto yy26;
-			if (yych <= '/') goto yy2;
-			if (yych <= ':') goto yy28;
-			goto yy2;
+		if (yych <= ' ') {
+			if (yych <= '\n') {
+				if (yych <= 0x00) goto yy85;
+				if (yych <= 0x08) goto yy4;
+			} else {
+				if (yych == '\r') goto yy85;
+				if (yych <= 0x1F) goto yy4;
+			}
+		} else {
+			if (yych <= '&') {
+				if (yych <= '!') goto yy4;
+				if (yych <= '"') goto yy31;
+				if (yych >= '$') goto yy4;
+			} else {
+				if (yych <= '\'') goto yy31;
+				if (yych <= '/') goto yy4;
+				if (yych <= ':') goto yy33;
+				goto yy4;
+			}
 		}
-	}
-yy73:
-	YYDEBUG(73, yych);
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy85:
+		YYDEBUG(85, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	phpdbg_init_param(yylval, ADDR_PARAM);
 	yylval->addr = strtoul(yytext, 0, 16);
 	return T_ADDR;
 }
-yy74:
-	YYDEBUG(74, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '\\') goto yy48;
-	goto yy7;
-yy75:
-	YYDEBUG(75, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'A') goto yy90;
-	if (yych == 'a') goto yy90;
-	goto yy3;
-yy76:
-	YYDEBUG(76, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'B') goto yy91;
-	if (yych == 'b') goto yy91;
-	goto yy3;
-yy77:
-	YYDEBUG(77, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'S') goto yy92;
-	if (yych == 's') goto yy92;
-	goto yy3;
-yy78:
-	YYDEBUG(78, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\f') {
-		if (yych == '\t') goto yy78;
-	} else {
-		if (yych <= '\r') goto yy78;
-		if (yych == ' ') goto yy78;
-	}
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy86:
+		YYDEBUG(86, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yych == '\\') goto yy56;
+		goto yy11;
+yy87:
+		YYDEBUG(87, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'A') goto yy107;
+		if (yych == 'a') goto yy107;
+		goto yy5;
+yy88:
+		YYDEBUG(88, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'B') goto yy108;
+		if (yych == 'b') goto yy108;
+		goto yy5;
+yy89:
+		YYDEBUG(89, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'S') goto yy109;
+		if (yych == 's') goto yy109;
+		goto yy5;
+yy90:
+		YYDEBUG(90, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(91, *YYCURSOR);
+		if (yych <= '\f') {
+			if (yych == '\t') goto yy90;
+		} else {
+			if (yych <= '\r') goto yy90;
+			if (yych == ' ') goto yy90;
+		}
+		YYDEBUG(92, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	YYSETCONDITION(RAW);
 	phpdbg_init_param(yylval, EMPTY_PARAM);
 	return T_IF;
 }
-yy79:
-	YYDEBUG(79, yych);
-	++YYCURSOR;
-	YYCURSOR -= 1;
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy93:
+		YYDEBUG(93, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(94, *YYCURSOR);
+		YYCURSOR -= 1;
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	phpdbg_init_param(yylval, NUMERIC_PARAM);
 	yylval->num = 0;
 	return T_FALSY;
 }
-yy80:
-	YYDEBUG(80, yych);
-	++YYCURSOR;
-	YYCURSOR -= 1;
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy95:
+		YYDEBUG(95, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(96, *YYCURSOR);
+		YYCURSOR -= 1;
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	phpdbg_init_param(yylval, NUMERIC_PARAM);
 	yylval->num = 1;
 	return T_TRUTHY;
 }
-yy81:
-	YYDEBUG(81, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy55;
-	if (yych == 'e') goto yy55;
-	goto yy3;
-yy82:
-	YYDEBUG(82, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy93;
-	goto yy3;
-yy83:
-	YYDEBUG(83, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'd') goto yy93;
-	goto yy3;
-yy84:
-	YYDEBUG(84, yych);
-	++YYCURSOR;
-yy85:
-	YYDEBUG(85, yych);
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy97:
+		YYDEBUG(97, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy64;
+		if (yych == 'e') goto yy64;
+		goto yy5;
+yy98:
+		YYDEBUG(98, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy110;
+		goto yy5;
+yy99:
+		YYDEBUG(99, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'd') goto yy110;
+		goto yy5;
+yy100:
+		YYDEBUG(100, *YYCURSOR);
+		++YYCURSOR;
+yy101:
+		YYDEBUG(101, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	phpdbg_init_param(yylval, STR_PARAM);
 	yylval->str = estrndup(yytext, yyleng);
 	yylval->len = yyleng;
 	return T_PROTO;
 }
-yy86:
-	YYDEBUG(86, yych);
-	yyaccept = 5;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x00) goto yy85;
-	if (yych == '\n') goto yy85;
-	goto yy32;
-yy87:
-	YYDEBUG(87, yych);
-	yyaccept = 5;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x00) goto yy85;
-	if (yych == '\n') goto yy85;
-	goto yy41;
-yy88:
-	YYDEBUG(88, yych);
-	yych = *++YYCURSOR;
-	if (yych == '.') goto yy89;
-	if (yych <= '/') goto yy7;
-	if (yych >= ':') goto yy7;
-yy89:
-	YYDEBUG(89, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych == '.') goto yy89;
-	if (yych <= '/') goto yy71;
-	if (yych <= '9') goto yy89;
-	goto yy71;
-yy90:
-	YYDEBUG(90, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'B') goto yy94;
-	if (yych == 'b') goto yy94;
-	goto yy3;
-yy91:
-	YYDEBUG(91, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy95;
-	if (yych == 'l') goto yy95;
-	goto yy3;
-yy92:
-	YYDEBUG(92, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy53;
-	if (yych == 'e') goto yy53;
-	goto yy3;
-yy93:
-	YYDEBUG(93, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == '_') goto yy96;
-	goto yy3;
-yy94:
-	YYDEBUG(94, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'L') goto yy97;
-	if (yych == 'l') goto yy97;
-	goto yy3;
-yy95:
-	YYDEBUG(95, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy98;
-	if (yych == 'e') goto yy98;
-	goto yy3;
-yy96:
-	YYDEBUG(96, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yybm_NORMAL[0+yych] & 128) goto yy99;
-	goto yy3;
-yy97:
-	YYDEBUG(97, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'E') goto yy101;
-	if (yych == 'e') goto yy101;
-	goto yy3;
-yy98:
-	YYDEBUG(98, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy55;
-	if (yych == 'd') goto yy55;
-	goto yy3;
-yy99:
-	YYDEBUG(99, yych);
-	yyaccept = 6;
-	YYMARKER = ++YYCURSOR;
-	YYFILL(3);
-	yych = *YYCURSOR;
-	if (yybm_NORMAL[0+yych] & 128) goto yy99;
-	if (yych <= ' ') {
-		if (yych <= '\n') {
-			if (yych <= 0x00) goto yy100;
-			if (yych <= 0x08) goto yy2;
-		} else {
-			if (yych == '\r') goto yy100;
-			if (yych <= 0x1F) goto yy2;
+yy102:
+		YYDEBUG(102, *YYCURSOR);
+		yyaccept = 5;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 0x00) goto yy101;
+		if (yych == '\n') goto yy101;
+		goto yy37;
+yy103:
+		YYDEBUG(103, *YYCURSOR);
+		yyaccept = 5;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 0x00) goto yy101;
+		if (yych == '\n') goto yy101;
+		goto yy47;
+yy104:
+		YYDEBUG(104, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == '.') goto yy105;
+		if (yych <= '/') goto yy11;
+		if (yych >= ':') goto yy11;
+yy105:
+		YYDEBUG(105, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(106, *YYCURSOR);
+		if (yych == '.') goto yy105;
+		if (yych <= '/') goto yy82;
+		if (yych <= '9') goto yy105;
+		goto yy82;
+yy107:
+		YYDEBUG(107, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'B') goto yy111;
+		if (yych == 'b') goto yy111;
+		goto yy5;
+yy108:
+		YYDEBUG(108, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy112;
+		if (yych == 'l') goto yy112;
+		goto yy5;
+yy109:
+		YYDEBUG(109, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy62;
+		if (yych == 'e') goto yy62;
+		goto yy5;
+yy110:
+		YYDEBUG(110, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == '_') goto yy113;
+		goto yy5;
+yy111:
+		YYDEBUG(111, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'L') goto yy114;
+		if (yych == 'l') goto yy114;
+		goto yy5;
+yy112:
+		YYDEBUG(112, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy115;
+		if (yych == 'e') goto yy115;
+		goto yy5;
+yy113:
+		YYDEBUG(113, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy116;
 		}
-	} else {
-		if (yych <= '&') {
-			if (yych <= '!') goto yy2;
-			if (yych <= '"') goto yy26;
-			if (yych >= '$') goto yy2;
-		} else {
-			if (yych <= '\'') goto yy26;
-			if (yych == ':') goto yy28;
-			goto yy2;
+		goto yy5;
+yy114:
+		YYDEBUG(114, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'E') goto yy119;
+		if (yych == 'e') goto yy119;
+		goto yy5;
+yy115:
+		YYDEBUG(115, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy64;
+		if (yych == 'd') goto yy64;
+		goto yy5;
+yy116:
+		YYDEBUG(116, *YYCURSOR);
+		yyaccept = 6;
+		YYMARKER = ++YYCURSOR;
+		YYFILL(3);
+		yych = *YYCURSOR;
+		YYDEBUG(117, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy116;
 		}
-	}
-yy100:
-	YYDEBUG(100, yych);
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+		if (yych <= ' ') {
+			if (yych <= '\n') {
+				if (yych <= 0x00) goto yy118;
+				if (yych <= 0x08) goto yy4;
+			} else {
+				if (yych == '\r') goto yy118;
+				if (yych <= 0x1F) goto yy4;
+			}
+		} else {
+			if (yych <= '&') {
+				if (yych <= '!') goto yy4;
+				if (yych <= '"') goto yy31;
+				if (yych >= '$') goto yy4;
+			} else {
+				if (yych <= '\'') goto yy31;
+				if (yych == ':') goto yy33;
+				goto yy4;
+			}
+		}
+yy118:
+		YYDEBUG(118, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	phpdbg_init_param(yylval, OP_PARAM);
 	yylval->str = estrndup(yytext, yyleng);
 	yylval->len = yyleng;
 	return T_OPCODE;
 }
-yy101:
-	YYDEBUG(101, yych);
-	yyaccept = 0;
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'D') goto yy53;
-	if (yych == 'd') goto yy53;
-	goto yy3;
+yy119:
+		YYDEBUG(119, *YYCURSOR);
+		yyaccept = 0;
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'D') goto yy62;
+		if (yych == 'd') goto yy62;
+		goto yy5;
+	}
 /* *********************************** */
 yyc_PRE_RAW:
-	YYFILL(2);
-	yych = *YYCURSOR;
-	YYDEBUG(102, yych);
-	if (yych <= '\r') {
-		if (yych == '\t') goto yy104;
-		if (yych >= '\r') goto yy104;
-	} else {
-		if (yych <= ' ') {
-			if (yych >= ' ') goto yy105;
+	{
+		static const unsigned char yybm[] = {
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,  64,   0,   0,   0,  64,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			 64,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0, 128,   0, 
+			128, 128, 128, 128, 128, 128, 128, 128, 
+			128, 128,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+		};
+		YYDEBUG(120, *YYCURSOR);
+		YYFILL(2);
+		yych = *YYCURSOR;
+		if (yych <= '\r') {
+			if (yych == '\t') goto yy124;
+			if (yych >= '\r') goto yy124;
 		} else {
-			if (yych == '-') goto yy106;
+			if (yych <= ' ') {
+				if (yych >= ' ') goto yy125;
+			} else {
+				if (yych == '-') goto yy128;
+			}
 		}
-	}
-	++YYCURSOR;
-yy103:
-	YYDEBUG(103, yych);
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+		YYDEBUG(122, *YYCURSOR);
+		++YYCURSOR;
+yy123:
+		YYDEBUG(123, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	YYSETCONDITION(RAW);
 
 	YYCURSOR = LEX(text);
 	goto restart;
 }
-yy104:
-	YYDEBUG(104, yych);
-	yych = *++YYCURSOR;
-	if (yybm_PRE_RAW[0+yych] & 64) goto yy105;
-	goto yy103;
-yy105:
-	YYDEBUG(105, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_PRE_RAW[0+yych] & 64) goto yy105;
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy124:
+		YYDEBUG(124, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yybm[0+yych] & 64) {
+			goto yy125;
+		}
+		goto yy123;
+yy125:
+		YYDEBUG(125, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(126, *YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy125;
+		}
+		YYDEBUG(127, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	/* ignore whitespace */
 
 	goto restart;
 }
-yy106:
-	YYDEBUG(106, yych);
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych != 'r') goto yy103;
-yy107:
-	YYDEBUG(107, yych);
-	++YYCURSOR;
-	YYFILL(2);
-	yych = *YYCURSOR;
-	if (yybm_PRE_RAW[0+yych] & 128) goto yy110;
-	if (yych <= '\r') {
-		if (yych == '\t') goto yy107;
-		if (yych >= '\r') goto yy107;
-	} else {
-		if (yych <= ' ') {
-			if (yych >= ' ') goto yy107;
+yy128:
+		YYDEBUG(128, *YYCURSOR);
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych != 'r') goto yy123;
+yy129:
+		YYDEBUG(129, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(2);
+		yych = *YYCURSOR;
+		YYDEBUG(130, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy133;
+		}
+		if (yych <= '\r') {
+			if (yych == '\t') goto yy129;
+			if (yych >= '\r') goto yy129;
 		} else {
-			if (yych == '-') goto yy109;
+			if (yych <= ' ') {
+				if (yych >= ' ') goto yy129;
+			} else {
+				if (yych == '-') goto yy132;
+			}
 		}
-	}
-yy108:
-	YYDEBUG(108, yych);
-	YYCURSOR = YYMARKER;
-	goto yy103;
-yy109:
-	YYDEBUG(109, yych);
-	yych = *++YYCURSOR;
-	if (yybm_PRE_RAW[0+yych] & 128) goto yy110;
-	goto yy108;
-yy110:
-	YYDEBUG(110, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_PRE_RAW[0+yych] & 128) goto yy110;
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy131:
+		YYDEBUG(131, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		goto yy123;
+yy132:
+		YYDEBUG(132, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yybm[0+yych] & 128) {
+			goto yy133;
+		}
+		goto yy131;
+yy133:
+		YYDEBUG(133, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(134, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy133;
+		}
+		YYDEBUG(135, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	char *text = yytext + 2;
 	while (*++text < '0');
 	yylval->num = atoi(text);
 	return T_REQ_ID;
 }
+	}
 /* *********************************** */
 yyc_RAW:
-	YYFILL(1);
-	yych = *YYCURSOR;
-	YYDEBUG(111, yych);
-	if (yybm_RAW[0+yych] & 1) goto yy113;
-	if (yych <= '\n') goto yy112;
-	if (yych <= '"') goto yy115;
-	if (yych <= '#') goto yy117;
-	if (yych <= '\'') goto yy118;
-	goto yy119;
-yy112:
-	YYDEBUG(112, yych);
-	++YYCURSOR;
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
 	{
+		static const unsigned char yybm[] = {
+			  0, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247,   0, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 148,  70, 247, 247, 247, 162, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247,   8, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+			247, 247, 247, 247, 247, 247, 247, 247, 
+		};
+		YYDEBUG(136, *YYCURSOR);
+		YYFILL(1);
+		yych = *YYCURSOR;
+		if (yybm[0+yych] & 1) {
+			goto yy140;
+		}
+		if (yych <= '\n') goto yy138;
+		if (yych <= '"') goto yy143;
+		if (yych <= '#') goto yy146;
+		if (yych <= '\'') goto yy148;
+		goto yy150;
+yy138:
+		YYDEBUG(138, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(139, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	return 0;
 }
-yy113:
-	YYDEBUG(113, yych);
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW[0+yych] & 1) goto yy113;
-	if (yych <= '\n') goto yy114;
-	if (yych <= '"') goto yy115;
-	if (yych <= '#') goto yy114;
-	if (yych <= '\'') goto yy118;
-	goto yy119;
-yy114:
-	YYDEBUG(114, yych);
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy140:
+		YYDEBUG(140, *YYCURSOR);
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(141, *YYCURSOR);
+		if (yybm[0+yych] & 1) {
+			goto yy140;
+		}
+		if (yych <= '\n') goto yy142;
+		if (yych <= '"') goto yy143;
+		if (yych <= '#') goto yy142;
+		if (yych <= '\'') goto yy148;
+		goto yy150;
+yy142:
+		YYDEBUG(142, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	phpdbg_init_param(yylval, STR_PARAM);
 	yylval->str = estrdup(yytext);
 	yylval->len = yyleng;
 	return T_INPUT;
 }
-yy115:
-	YYDEBUG(115, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW[0+yych] & 2) goto yy115;
-	if (yych <= '\n') goto yy116;
-	if (yych <= '"') goto yy113;
-	goto yy120;
-yy116:
-	YYDEBUG(116, yych);
-	YYCURSOR = YYMARKER;
-	goto yy114;
-yy117:
-	YYDEBUG(117, yych);
-	++YYCURSOR;
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy143:
+		YYDEBUG(143, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(144, *YYCURSOR);
+		if (yybm[0+yych] & 2) {
+			goto yy143;
+		}
+		if (yych <= '\n') goto yy145;
+		if (yych <= '"') goto yy140;
+		goto yy152;
+yy145:
+		YYDEBUG(145, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		goto yy142;
+yy146:
+		YYDEBUG(146, *YYCURSOR);
+		++YYCURSOR;
+		YYDEBUG(147, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	YYSETCONDITION(INITIAL);
 	return T_SEPARATOR;
 }
-yy118:
-	YYDEBUG(118, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW[0+yych] & 4) goto yy118;
-	if (yych <= '\n') goto yy116;
-	if (yych <= '\'') goto yy113;
-	goto yy121;
-yy119:
-	YYDEBUG(119, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW[0+yych] & 8) goto yy119;
-	if (yych <= '!') {
-		if (yych <= 0x00) goto yy114;
-		if (yych == '\n') goto yy114;
-		goto yy113;
-	} else {
-		if (yych <= '"') goto yy122;
-		if (yych == '\'') goto yy123;
-		goto yy113;
-	}
-yy120:
-	YYDEBUG(120, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW[0+yych] & 2) goto yy115;
-	if (yych <= '\n') goto yy116;
-	if (yych <= '"') goto yy122;
-	goto yy120;
-yy121:
-	YYDEBUG(121, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW[0+yych] & 4) goto yy118;
-	if (yych <= '\n') goto yy116;
-	if (yych <= '\'') goto yy123;
-	goto yy121;
-yy122:
-	YYDEBUG(122, yych);
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW[0+yych] & 16) goto yy122;
-	if (yych <= '\n') goto yy114;
-	if (yych <= '#') goto yy115;
-	if (yych <= '\'') goto yy124;
-	goto yy125;
-yy123:
-	YYDEBUG(123, yych);
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW[0+yych] & 32) goto yy123;
-	if (yych <= '\n') goto yy114;
-	if (yych <= '"') goto yy124;
-	if (yych <= '#') goto yy118;
-	goto yy126;
-yy124:
-	YYDEBUG(124, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW[0+yych] & 64) goto yy124;
-	if (yych <= '\n') goto yy116;
-	if (yych <= '"') goto yy123;
-	if (yych <= '\'') goto yy122;
-	goto yy127;
-yy125:
-	YYDEBUG(125, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '&') {
-		if (yych <= 0x00) goto yy114;
-		if (yych == '\n') goto yy114;
-		goto yy122;
-	} else {
-		if (yych <= '\'') goto yy128;
-		if (yych == '\\') goto yy125;
-		goto yy122;
-	}
-yy126:
-	YYDEBUG(126, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '!') {
-		if (yych <= 0x00) goto yy114;
-		if (yych == '\n') goto yy114;
-		goto yy123;
-	} else {
-		if (yych <= '"') goto yy128;
-		if (yych == '\\') goto yy126;
-		goto yy123;
-	}
-yy127:
-	YYDEBUG(127, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW[0+yych] & 64) goto yy124;
-	if (yych <= '\n') goto yy116;
-	if (yych >= '(') goto yy127;
-yy128:
-	YYDEBUG(128, yych);
-	YYMARKER = ++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_RAW[0+yych] & 128) goto yy128;
-	if (yych <= '\n') goto yy114;
-	if (yych <= '#') goto yy124;
-yy129:
-	YYDEBUG(129, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\n') {
-		if (yych <= 0x00) goto yy114;
-		if (yych <= '\t') goto yy128;
-		goto yy114;
-	} else {
-		if (yych == '\\') goto yy129;
-		goto yy128;
+yy148:
+		YYDEBUG(148, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(149, *YYCURSOR);
+		if (yybm[0+yych] & 4) {
+			goto yy148;
+		}
+		if (yych <= '\n') goto yy145;
+		if (yych <= '\'') goto yy140;
+		goto yy154;
+yy150:
+		YYDEBUG(150, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(151, *YYCURSOR);
+		if (yybm[0+yych] & 8) {
+			goto yy150;
+		}
+		if (yych <= '!') {
+			if (yych <= 0x00) goto yy142;
+			if (yych == '\n') goto yy142;
+			goto yy140;
+		} else {
+			if (yych <= '"') goto yy156;
+			if (yych == '\'') goto yy158;
+			goto yy140;
+		}
+yy152:
+		YYDEBUG(152, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(153, *YYCURSOR);
+		if (yybm[0+yych] & 2) {
+			goto yy143;
+		}
+		if (yych <= '\n') goto yy145;
+		if (yych <= '"') goto yy156;
+		goto yy152;
+yy154:
+		YYDEBUG(154, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(155, *YYCURSOR);
+		if (yybm[0+yych] & 4) {
+			goto yy148;
+		}
+		if (yych <= '\n') goto yy145;
+		if (yych <= '\'') goto yy158;
+		goto yy154;
+yy156:
+		YYDEBUG(156, *YYCURSOR);
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(157, *YYCURSOR);
+		if (yybm[0+yych] & 16) {
+			goto yy156;
+		}
+		if (yych <= '\n') goto yy142;
+		if (yych <= '#') goto yy143;
+		if (yych <= '\'') goto yy160;
+		goto yy162;
+yy158:
+		YYDEBUG(158, *YYCURSOR);
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(159, *YYCURSOR);
+		if (yybm[0+yych] & 32) {
+			goto yy158;
+		}
+		if (yych <= '\n') goto yy142;
+		if (yych <= '"') goto yy160;
+		if (yych <= '#') goto yy148;
+		goto yy164;
+yy160:
+		YYDEBUG(160, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(161, *YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy160;
+		}
+		if (yych <= '\n') goto yy145;
+		if (yych <= '"') goto yy158;
+		if (yych <= '\'') goto yy156;
+		goto yy166;
+yy162:
+		YYDEBUG(162, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(163, *YYCURSOR);
+		if (yych <= '&') {
+			if (yych <= 0x00) goto yy142;
+			if (yych == '\n') goto yy142;
+			goto yy156;
+		} else {
+			if (yych <= '\'') goto yy168;
+			if (yych == '\\') goto yy162;
+			goto yy156;
+		}
+yy164:
+		YYDEBUG(164, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(165, *YYCURSOR);
+		if (yych <= '!') {
+			if (yych <= 0x00) goto yy142;
+			if (yych == '\n') goto yy142;
+			goto yy158;
+		} else {
+			if (yych <= '"') goto yy168;
+			if (yych == '\\') goto yy164;
+			goto yy158;
+		}
+yy166:
+		YYDEBUG(166, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(167, *YYCURSOR);
+		if (yybm[0+yych] & 64) {
+			goto yy160;
+		}
+		if (yych <= '\n') goto yy145;
+		if (yych >= '(') goto yy166;
+yy168:
+		YYDEBUG(168, *YYCURSOR);
+		YYMARKER = ++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(169, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy168;
+		}
+		if (yych <= '\n') goto yy142;
+		if (yych <= '#') goto yy160;
+yy170:
+		YYDEBUG(170, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(171, *YYCURSOR);
+		if (yych <= '\n') {
+			if (yych <= 0x00) goto yy142;
+			if (yych <= '\t') goto yy168;
+			goto yy142;
+		} else {
+			if (yych == '\\') goto yy170;
+			goto yy168;
+		}
 	}
 /* *********************************** */
 yyc_INITIAL:
-	YYFILL(4);
-	yych = *YYCURSOR;
-	YYDEBUG(130, yych);
-	if (yych <= 'E') {
-		if (yych <= '\r') {
-			if (yych == '\t') goto yy133;
-			if (yych >= '\r') goto yy133;
-		} else {
-			if (yych == ' ') goto yy134;
-			if (yych >= 'E') goto yy135;
-		}
-	} else {
-		if (yych <= 'd') {
-			if (yych <= 'Q') goto yy131;
-			if (yych <= 'R') goto yy136;
-			if (yych <= 'S') goto yy137;
+	{
+		static const unsigned char yybm[] = {
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0, 128,   0,   0,   0, 128,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			128,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+			  0,   0,   0,   0,   0,   0,   0,   0, 
+		};
+		YYDEBUG(172, *YYCURSOR);
+		YYFILL(4);
+		yych = *YYCURSOR;
+		if (yych <= 'E') {
+			if (yych <= '\r') {
+				if (yych == '\t') goto yy176;
+				if (yych >= '\r') goto yy176;
+			} else {
+				if (yych == ' ') goto yy177;
+				if (yych >= 'E') goto yy180;
+			}
 		} else {
-			if (yych <= 'q') {
-				if (yych <= 'e') goto yy135;
+			if (yych <= 'd') {
+				if (yych <= 'Q') goto yy174;
+				if (yych <= 'R') goto yy181;
+				if (yych <= 'S') goto yy182;
 			} else {
-				if (yych <= 'r') goto yy138;
-				if (yych <= 's') goto yy137;
+				if (yych <= 'q') {
+					if (yych <= 'e') goto yy180;
+				} else {
+					if (yych <= 'r') goto yy183;
+					if (yych <= 's') goto yy182;
+				}
 			}
 		}
-	}
-yy131:
-	YYDEBUG(131, yych);
-	++YYCURSOR;
-yy132:
-	YYDEBUG(132, yych);
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy174:
+		YYDEBUG(174, *YYCURSOR);
+		++YYCURSOR;
+yy175:
+		YYDEBUG(175, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	YYSETCONDITION(NORMAL);
 
 	YYCURSOR = LEX(text);
 	goto restart;
 }
-yy133:
-	YYDEBUG(133, yych);
-	yych = *++YYCURSOR;
-	if (yybm_INITIAL[0+yych] & 128) goto yy134;
-	goto yy132;
-yy134:
-	YYDEBUG(134, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yybm_INITIAL[0+yych] & 128) goto yy134;
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy176:
+		YYDEBUG(176, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yybm[0+yych] & 128) {
+			goto yy177;
+		}
+		goto yy175;
+yy177:
+		YYDEBUG(177, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(178, *YYCURSOR);
+		if (yybm[0+yych] & 128) {
+			goto yy177;
+		}
+		YYDEBUG(179, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	/* ignore whitespace */
 
 	goto restart;
 }
-yy135:
-	YYDEBUG(135, yych);
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'V') goto yy139;
-	if (yych == 'v') goto yy139;
-	goto yy132;
-yy136:
-	YYDEBUG(136, yych);
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'U') goto yy141;
-	if (yych == 'u') goto yy141;
-	goto yy132;
-yy137:
-	YYDEBUG(137, yych);
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych == 'H') goto yy142;
-	if (yych == 'h') goto yy142;
-	goto yy132;
-yy138:
-	YYDEBUG(138, yych);
-	yych = *(YYMARKER = ++YYCURSOR);
-	if (yych <= 0x1F) {
-		if (yych <= '\t') {
-			if (yych <= 0x08) goto yy132;
-			goto yy143;
+yy180:
+		YYDEBUG(180, *YYCURSOR);
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'V') goto yy184;
+		if (yych == 'v') goto yy184;
+		goto yy175;
+yy181:
+		YYDEBUG(181, *YYCURSOR);
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'U') goto yy186;
+		if (yych == 'u') goto yy186;
+		goto yy175;
+yy182:
+		YYDEBUG(182, *YYCURSOR);
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych == 'H') goto yy187;
+		if (yych == 'h') goto yy187;
+		goto yy175;
+yy183:
+		YYDEBUG(183, *YYCURSOR);
+		yych = *(YYMARKER = ++YYCURSOR);
+		if (yych <= 0x1F) {
+			if (yych <= '\t') {
+				if (yych <= 0x08) goto yy175;
+				goto yy188;
+			} else {
+				if (yych == '\r') goto yy188;
+				goto yy175;
+			}
 		} else {
-			if (yych == '\r') goto yy143;
-			goto yy132;
+			if (yych <= 'U') {
+				if (yych <= ' ') goto yy188;
+				if (yych <= 'T') goto yy175;
+				goto yy186;
+			} else {
+				if (yych == 'u') goto yy186;
+				goto yy175;
+			}
 		}
-	} else {
-		if (yych <= 'U') {
-			if (yych <= ' ') goto yy143;
-			if (yych <= 'T') goto yy132;
-			goto yy141;
+yy184:
+		YYDEBUG(184, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\f') {
+			if (yych == '\t') goto yy191;
 		} else {
-			if (yych == 'u') goto yy141;
-			goto yy132;
+			if (yych <= '\r') goto yy191;
+			if (yych == ' ') goto yy191;
 		}
-	}
-yy139:
-	YYDEBUG(139, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '\f') {
-		if (yych == '\t') goto yy144;
-	} else {
-		if (yych <= '\r') goto yy144;
-		if (yych == ' ') goto yy144;
-	}
-yy140:
-	YYDEBUG(140, yych);
-	YYCURSOR = YYMARKER;
-	goto yy132;
-yy141:
-	YYDEBUG(141, yych);
-	yych = *++YYCURSOR;
-	if (yych == 'N') goto yy145;
-	if (yych == 'n') goto yy145;
-	goto yy140;
-yy142:
-	YYDEBUG(142, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '\f') {
-		if (yych == '\t') goto yy146;
-		goto yy140;
-	} else {
-		if (yych <= '\r') goto yy146;
-		if (yych == ' ') goto yy146;
-		goto yy140;
-	}
-yy143:
-	YYDEBUG(143, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\f') {
-		if (yych == '\t') goto yy143;
-	} else {
-		if (yych <= '\r') goto yy143;
-		if (yych == ' ') goto yy143;
-	}
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy185:
+		YYDEBUG(185, *YYCURSOR);
+		YYCURSOR = YYMARKER;
+		goto yy175;
+yy186:
+		YYDEBUG(186, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych == 'N') goto yy194;
+		if (yych == 'n') goto yy194;
+		goto yy185;
+yy187:
+		YYDEBUG(187, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\f') {
+			if (yych == '\t') goto yy195;
+			goto yy185;
+		} else {
+			if (yych <= '\r') goto yy195;
+			if (yych == ' ') goto yy195;
+			goto yy185;
+		}
+yy188:
+		YYDEBUG(188, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(189, *YYCURSOR);
+		if (yych <= '\f') {
+			if (yych == '\t') goto yy188;
+		} else {
+			if (yych <= '\r') goto yy188;
+			if (yych == ' ') goto yy188;
+		}
+		YYDEBUG(190, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	YYSETCONDITION(PRE_RAW);
 	phpdbg_init_param(yylval, EMPTY_PARAM);
 	return T_RUN;
 }
-yy144:
-	YYDEBUG(144, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\f') {
-		if (yych == '\t') goto yy144;
-	} else {
-		if (yych <= '\r') goto yy144;
-		if (yych == ' ') goto yy144;
-	}
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy191:
+		YYDEBUG(191, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(192, *YYCURSOR);
+		if (yych <= '\f') {
+			if (yych == '\t') goto yy191;
+		} else {
+			if (yych <= '\r') goto yy191;
+			if (yych == ' ') goto yy191;
+		}
+		YYDEBUG(193, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	YYSETCONDITION(PRE_RAW);
 	phpdbg_init_param(yylval, EMPTY_PARAM);
 	return T_EVAL;
 }
-yy145:
-	YYDEBUG(145, yych);
-	yych = *++YYCURSOR;
-	if (yych <= '\f') {
-		if (yych == '\t') goto yy143;
-		goto yy140;
-	} else {
-		if (yych <= '\r') goto yy143;
-		if (yych == ' ') goto yy143;
-		goto yy140;
-	}
-yy146:
-	YYDEBUG(146, yych);
-	++YYCURSOR;
-	YYFILL(1);
-	yych = *YYCURSOR;
-	if (yych <= '\f') {
-		if (yych == '\t') goto yy146;
-	} else {
-		if (yych <= '\r') goto yy146;
-		if (yych == ' ') goto yy146;
-	}
-	yyleng = (size_t) YYCURSOR - (size_t) yytext;
-	{
+yy194:
+		YYDEBUG(194, *YYCURSOR);
+		yych = *++YYCURSOR;
+		if (yych <= '\f') {
+			if (yych == '\t') goto yy188;
+			goto yy185;
+		} else {
+			if (yych <= '\r') goto yy188;
+			if (yych == ' ') goto yy188;
+			goto yy185;
+		}
+yy195:
+		YYDEBUG(195, *YYCURSOR);
+		++YYCURSOR;
+		YYFILL(1);
+		yych = *YYCURSOR;
+		YYDEBUG(196, *YYCURSOR);
+		if (yych <= '\f') {
+			if (yych == '\t') goto yy195;
+		} else {
+			if (yych <= '\r') goto yy195;
+			if (yych == ' ') goto yy195;
+		}
+		YYDEBUG(197, *YYCURSOR);
+		yyleng = (size_t) YYCURSOR - (size_t) yytext;
+		{
 	YYSETCONDITION(PRE_RAW);
 	phpdbg_init_param(yylval, EMPTY_PARAM);
 	return T_SHELL;
 }
+	}
 }
 
 }
diff -Nru php8.2-8.2.29/sapi/phpdbg/phpdbg_parser.c php8.2-8.2.30/sapi/phpdbg/phpdbg_parser.c
--- php8.2-8.2.29/sapi/phpdbg/phpdbg_parser.c	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/sapi/phpdbg/phpdbg_parser.c	2025-12-16 17:18:12.000000000 +0000
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.8.2.  */
+/* A Bison parser, made by GNU Bison 3.7.5.  */
 
 /* Bison implementation for Yacc-like parsers in C
 
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -46,10 +46,10 @@
    USER NAME SPACE" below.  */
 
 /* Identify Bison output, and Bison version.  */
-#define YYBISON 30802
+#define YYBISON 30705
 
 /* Bison version string.  */
-#define YYBISON_VERSION "3.8.2"
+#define YYBISON_VERSION "3.7.5"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -308,18 +308,12 @@
 # define YY_USE(E) /* empty */
 #endif
 
+#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
 /* Suppress an incorrect diagnostic about yylval being uninitialized.  */
-#if defined __GNUC__ && ! defined __ICC && 406 <= __GNUC__ * 100 + __GNUC_MINOR__
-# if __GNUC__ * 100 + __GNUC_MINOR__ < 407
-#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
-    _Pragma ("GCC diagnostic push")                                     \
-    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")
-# else
-#  define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                           \
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN                            \
     _Pragma ("GCC diagnostic push")                                     \
     _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")              \
     _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
-# endif
 # define YY_IGNORE_MAYBE_UNINITIALIZED_END      \
     _Pragma ("GCC diagnostic pop")
 #else
@@ -535,7 +529,7 @@
 };
 
 #if PHPDBG_DEBUG
-/* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
        0,    67,    67,    68,    69,    73,    74,    78,    79,    80,
@@ -578,6 +572,17 @@
 }
 #endif
 
+#ifdef YYPRINT
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
+static const yytype_int16 yytoknum[] =
+{
+       0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
+     265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
+     275,   276,   277
+};
+#endif
+
 #define YYPACT_NINF (-15)
 
 #define yypact_value_is_default(Yyn) \
@@ -588,8 +593,8 @@
 #define yytable_value_is_error(Yyn) \
   0
 
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
 static const yytype_int8 yypact[] =
 {
       -3,   -14,   -14,   -14,   -10,   -15,   -15,    12,   -15,   -15,
@@ -599,9 +604,9 @@
       29,   -15,   -15,    30,   -15,   -15
 };
 
-/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
-   Performed when YYTABLE does not specify something else to do.  Zero
-   means the default is an error.  */
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
 static const yytype_int8 yydefact[] =
 {
        4,    26,    26,    26,     0,    21,    22,     0,    23,    20,
@@ -611,21 +616,21 @@
        0,    12,    11,     0,    13,    15
 };
 
-/* YYPGOTO[NTERM-NUM].  */
+  /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int8 yypgoto[] =
 {
      -15,   -15,    23,   -15,    32,    20,   -15
 };
 
-/* YYDEFGOTO[NTERM-NUM].  */
+  /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int8 yydefgoto[] =
 {
        0,    13,    14,    15,    16,    19,    17
 };
 
-/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule whose
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int8 yytable[] =
 {
        1,     2,     3,     4,     5,     6,    35,    27,    18,    36,
@@ -646,8 +651,8 @@
       -1,    28
 };
 
-/* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of
-   state STATE-NUM.  */
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
 static const yytype_int8 yystos[] =
 {
        0,     3,     4,     5,     6,     7,     8,    14,    15,    16,
@@ -657,7 +662,7 @@
       12,    15,    15,    12,    15,    15
 };
 
-/* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM.  */
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_int8 yyr1[] =
 {
        0,    23,    24,    24,    24,    25,    25,    26,    26,    26,
@@ -666,7 +671,7 @@
       29
 };
 
-/* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM.  */
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
 static const yytype_int8 yyr2[] =
 {
        0,     2,     1,     3,     0,     1,     1,     1,     2,     2,
@@ -684,7 +689,6 @@
 #define YYACCEPT        goto yyacceptlab
 #define YYABORT         goto yyabortlab
 #define YYERROR         goto yyerrorlab
-#define YYNOMEM         goto yyexhaustedlab
 
 
 #define YYRECOVERING()  (!!yyerrstatus)
@@ -725,7 +729,10 @@
     YYFPRINTF Args;                             \
 } while (0)
 
-
+/* This macro is provided for backward compatibility. */
+# ifndef YY_LOCATION_PRINT
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 
 
 # define YY_SYMBOL_PRINT(Title, Kind, Value, Location)                    \
@@ -752,6 +759,10 @@
   YY_USE (yyoutput);
   if (!yyvaluep)
     return;
+# ifdef YYPRINT
+  if (yykind < YYNTOKENS)
+    YYPRINT (yyo, yytoknum[yykind], *yyvaluep);
+# endif
   YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   YY_USE (yykind);
   YY_IGNORE_MAYBE_UNINITIALIZED_END
@@ -1212,7 +1223,6 @@
   YYDPRINTF ((stderr, "Starting parse\n"));
 
   yychar = PHPDBG_EMPTY; /* Cause a token to be read.  */
-
   goto yysetstate;
 
 
@@ -1238,7 +1248,7 @@
 
   if (yyss + yystacksize - 1 <= yyssp)
 #if !defined yyoverflow && !defined YYSTACK_RELOCATE
-    YYNOMEM;
+    goto yyexhaustedlab;
 #else
     {
       /* Get the current used size of the three stacks, in elements.  */
@@ -1266,7 +1276,7 @@
 # else /* defined YYSTACK_RELOCATE */
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-        YYNOMEM;
+        goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
         yystacksize = YYMAXDEPTH;
@@ -1277,7 +1287,7 @@
           YY_CAST (union yyalloc *,
                    YYSTACK_ALLOC (YY_CAST (YYSIZE_T, YYSTACK_BYTES (yystacksize))));
         if (! yyptr)
-          YYNOMEM;
+          goto yyexhaustedlab;
         YYSTACK_RELOCATE (yyss_alloc, yyss);
         YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
@@ -1299,7 +1309,6 @@
     }
 #endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
 
-
   if (yystate == YYFINAL)
     YYACCEPT;
 
@@ -1658,7 +1667,7 @@
           }
         yyerror (yymsgp);
         if (yysyntax_error_status == YYENOMEM)
-          YYNOMEM;
+          goto yyexhaustedlab;
       }
     }
 
@@ -1694,7 +1703,6 @@
      label yyerrorlab therefore never appears in user code.  */
   if (0)
     YYERROR;
-  ++yynerrs;
 
   /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
@@ -1755,7 +1763,7 @@
 `-------------------------------------*/
 yyacceptlab:
   yyresult = 0;
-  goto yyreturnlab;
+  goto yyreturn;
 
 
 /*-----------------------------------.
@@ -1763,22 +1771,24 @@
 `-----------------------------------*/
 yyabortlab:
   yyresult = 1;
-  goto yyreturnlab;
+  goto yyreturn;
 
 
-/*-----------------------------------------------------------.
-| yyexhaustedlab -- YYNOMEM (memory exhaustion) comes here.  |
-`-----------------------------------------------------------*/
+#if 1
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
 yyexhaustedlab:
   yyerror (YY_("memory exhausted"));
   yyresult = 2;
-  goto yyreturnlab;
+  goto yyreturn;
+#endif
 
 
-/*----------------------------------------------------------.
-| yyreturnlab -- parsing is finished, clean up and return.  |
-`----------------------------------------------------------*/
-yyreturnlab:
+/*-------------------------------------------------------.
+| yyreturn -- parsing is finished, clean up and return.  |
+`-------------------------------------------------------*/
+yyreturn:
   if (yychar != PHPDBG_EMPTY)
     {
       /* Make sure we have latest lookahead translation.  See comments at
diff -Nru php8.2-8.2.29/sapi/phpdbg/phpdbg_parser.h php8.2-8.2.30/sapi/phpdbg/phpdbg_parser.h
--- php8.2-8.2.29/sapi/phpdbg/phpdbg_parser.h	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/sapi/phpdbg/phpdbg_parser.h	2025-12-16 17:18:12.000000000 +0000
@@ -1,4 +1,4 @@
-/* A Bison parser, made by GNU Bison 3.8.2.  */
+/* A Bison parser, made by GNU Bison 3.7.5.  */
 
 /* Bison interface for Yacc-like parsers in C
 
@@ -16,7 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* As a special exception, you may create a larger work that contains
    part or all of the Bison parser skeleton and distribute that work
@@ -103,8 +103,6 @@
 
 
 
-
 int phpdbg_parse (void);
 
-
 #endif /* !YY_PHPDBG_SAPI_PHPDBG_PHPDBG_PARSER_H_INCLUDED  */
diff -Nru php8.2-8.2.29/sapi/phpdbg/phpdbg_parser.output php8.2-8.2.30/sapi/phpdbg/phpdbg_parser.output
--- php8.2-8.2.29/sapi/phpdbg/phpdbg_parser.output	2025-07-01 16:29:21.000000000 +0000
+++ php8.2-8.2.30/sapi/phpdbg/phpdbg_parser.output	2025-12-16 17:18:12.000000000 +0000
@@ -10,7 +10,7 @@
 
     1 input: command
     2      | input "# (pound sign)" command
-    3      | ε
+    3      | %empty
 
     4 command: parameters
     5        | full_expression
@@ -36,7 +36,7 @@
    23          | "identifier (command or function name)"
 
    24 req_id: "request id (-r %d)"
-   25       | ε
+   25       | %empty
 
    26 full_expression: "eval" req_id "input (input string or data)"
    27                | "shell" req_id "input (input string or data)"