[packages] php5: add PECL dio extension

SVN-Revision: 27802

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 4b4a00b1bcb758c6be3984e8ed663a6ddcc9cde1..0596aedf9e40afc3c64ed4f98a60606a1a696568 100644 (file)
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=php
 PKG_VERSION:=5.3.6
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.php.net/distributions/
@@ -22,7 +22,7 @@ PHP5_MODULES = \
        apc \
        ctype curl \
        fileinfo \
-       dom \
+       dio dom \
        exif \
        ftp \
        gettext gd gmp \
@@ -194,6 +194,12 @@ else
   CONFIGURE_ARGS+= --without-gettext
 endif
 
+ifneq ($(CONFIG_PACKAGE_php5-mod-dio),)
+  CONFIGURE_ARGS+= --enable-dio=shared
+else
+  CONFIGURE_ARGS+= --disable-dio
+endif
+
 ifneq ($(CONFIG_PACKAGE_php5-mod-dom),)
   CONFIGURE_ARGS+= --enable-dom=shared
 else
@@ -481,6 +487,7 @@ $(eval $(call BuildModule,apc,APC,+librt))
 $(eval $(call BuildModule,ctype,Ctype))
 $(eval $(call BuildModule,curl,cURL,+libcurl))
 $(eval $(call BuildModule,fileinfo,Fileinfo,+libmagic))
+$(eval $(call BuildModule,dio,Direct IO))
 $(eval $(call BuildModule,dom,DOM,@PHP5_LIBXML +libxml2))
 $(eval $(call BuildModule,exif,EXIF))
 $(eval $(call BuildModule,ftp,FTP))

diff --git a/lang/php5/patches/010-PECL-dio.patch b/lang/php5/patches/010-PECL-dio.patch
new file mode 100644 (file)
index 0000000..40867ed
--- /dev/null
+++ b/lang/php5/patches/010-PECL-dio.patch
@@ -0,0 +1,3473 @@
+--- /dev/null
++++ b/ext/dio/config.m4
+@@ -0,0 +1,10 @@
++dnl
++dnl $Id: config.m4 291957 2009-12-10 17:13:14Z cyberspice $
++dnl 
++
++PHP_ARG_ENABLE(dio, whether to enable direct I/O support,
++[  --enable-dio            Enable direct I/O support])
++
++if test "$PHP_DIO" != "no"; then
++  PHP_NEW_EXTENSION(dio, dio.c dio_common.c dio_posix.c dio_stream_wrappers.c, $ext_shared)
++fi
+--- /dev/null
++++ b/ext/dio/dio.c
+@@ -0,0 +1,801 @@
++/*
++   +----------------------------------------------------------------------+
++   | PHP Version 5                                                        |
++   +----------------------------------------------------------------------+
++   | Copyright (c) 1997-2009 The PHP Group                                |
++   +----------------------------------------------------------------------+
++   | This source file is subject to version 3.0 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:           |
++   | http://www.php.net/license/3_0.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.               |
++   +----------------------------------------------------------------------+
++   | Author: Sterling Hughes <sterling@php.net>                           |
++   | Author: Melanie Rhianna Lewis <cyberspice@php.net>                   |
++   +----------------------------------------------------------------------+
++ */
++
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#include "php.h"
++#include "php_ini.h"
++#include "ext/standard/info.h"
++
++#include "php_dio.h"
++#include "php_dio_stream_wrappers.h"
++
++#include <sys/stat.h>
++#include <sys/types.h>
++
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
++#include <fcntl.h>
++#ifndef PHP_WIN32
++#include <termios.h>
++#endif
++
++/* e.g. IRIX does not have CRTSCTS */
++#ifndef CRTSCTS
++# ifdef CNEW_RTSCTS
++#  define CRTSCTS CNEW_RTSCTS
++# else
++#  define CRTSCTS 0
++# endif /* CNEW_RTSCTS */
++#endif /* !CRTSCTS */
++
++/*
++   +----------------------------------------------------------------------+
++   |                       DEPRECATED FUNCTIONALITY                       |
++   +----------------------------------------------------------------------+
++   | The functions below are from the earlier DIO versions.  They will    |
++   | continue to be maintained but not extended.  It is thoroughly        |
++   | recommended that you should use either the stream wrappers or the    |
++   | DIO classes in new code. - Melanie                                   |
++   +----------------------------------------------------------------------+
++ */
++
++#define le_fd_name "Direct I/O File Descriptor"
++static int le_fd;
++
++static int new_php_fd(php_fd_t **f, int fd)
++{
++      if (!(*f = malloc(sizeof(php_fd_t)))) {
++              return 0;
++      }
++      (*f)->fd = fd;
++      return 1;
++}
++
++static void _dio_close_fd(zend_rsrc_list_entry *rsrc TSRMLS_DC)
++{
++      php_fd_t *f = (php_fd_t *) rsrc->ptr;
++      if (f) {
++              close(f->fd);
++              free(f);
++      }
++}
++
++/* {{{ proto resource dio_open(string filename, int flags[, int mode])
++   Open a new filename with specified permissions of flags and creation permissions of mode */
++PHP_FUNCTION(dio_open)
++{
++      php_fd_t *f;
++      char     *file_name;
++      int       file_name_length;
++      long      flags;
++      long      mode = 0;
++      int       fd;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl|l", &file_name, &file_name_length, &flags, &mode) == FAILURE) {
++              return;
++      }
++
++      if (php_check_open_basedir(file_name TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(file_name, "wb+", CHECKUID_CHECK_MODE_PARAM))) {
++              RETURN_FALSE;
++      }
++
++      if (ZEND_NUM_ARGS() == 3) {
++              fd = open(file_name, flags, mode);
++      } else {
++              fd = open(file_name, flags);
++      }
++
++      if (fd == -1) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot open file %s with flags %ld and permissions %ld: %s", file_name, flags, mode, strerror(errno));
++              RETURN_FALSE;
++      }
++
++
++      if (!new_php_fd(&f, fd)) {
++              RETURN_FALSE;
++      }
++      ZEND_REGISTER_RESOURCE(return_value, f, le_fd);
++}
++/* }}} */
++
++/* {{{ proto string dio_read(resource fd[, int n])
++   Read n bytes from fd and return them, if n is not specified, read 1k */
++PHP_FUNCTION(dio_read)
++{
++      zval     *r_fd;
++      php_fd_t *f;
++      char     *data;
++      long      bytes = 1024;
++      ssize_t   res;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &r_fd, &bytes) == FAILURE) {
++              return;
++      }
++
++      ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);
++
++      if (bytes <= 0) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter must be greater than 0.");
++              RETURN_FALSE;
++      }
++
++      data = emalloc(bytes + 1);
++      res = read(f->fd, data, bytes);
++      if (res <= 0) {
++              efree(data);
++              RETURN_NULL();
++      }
++
++      data = erealloc(data, res + 1);
++      data[res] = 0;
++
++      RETURN_STRINGL(data, res, 0);
++}
++/* }}} */
++
++/* {{{ proto int dio_write(resource fd, string data[, int len])
++   Write data to fd with optional truncation at length */
++PHP_FUNCTION(dio_write)
++{
++      zval     *r_fd;
++      php_fd_t *f;
++      char     *data;
++      int       data_len;
++      long      trunc_len = 0;
++      ssize_t   res;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &r_fd, &data, &data_len, &trunc_len) == FAILURE) {
++              return;
++      }
++
++      if (trunc_len < 0 || trunc_len > data_len) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "length must be greater or equal to zero and less then the length of the specified string.");
++              RETURN_FALSE;
++      }
++
++      ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);
++
++      res = write(f->fd, data, trunc_len ? trunc_len : data_len);
++      if (res == -1) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot write data to file descriptor %d, %s", f->fd, strerror(errno));
++      }
++
++      RETURN_LONG(res);
++}
++/* }}} */
++
++#ifndef PHP_WIN32
++
++/* {{{ proto bool dio_truncate(resource fd, int offset)
++   Truncate file descriptor fd to offset bytes */
++PHP_FUNCTION(dio_truncate)
++{
++      zval     *r_fd;
++      php_fd_t *f;
++      long      offset;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &r_fd, &offset) == FAILURE) {
++              return;
++      }
++
++      ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);
++
++      if (ftruncate(f->fd, offset) == -1) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "couldn't truncate %d to %ld bytes: %s", f->fd, offset, strerror(errno));
++              RETURN_FALSE;
++      }
++
++      RETURN_TRUE;
++}
++/* }}} */
++#endif
++
++#define ADD_FIELD(f, v) add_assoc_long_ex(return_value, (f), sizeof(f), v);
++
++/* {{{ proto array dio_stat(resource fd)
++   Get stat information about the file descriptor fd */
++PHP_FUNCTION(dio_stat)
++{
++      zval        *r_fd;
++      php_fd_t    *f;
++      struct stat  s;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &r_fd) == FAILURE) {
++              return;
++      }
++
++      ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);
++
++      if (fstat(f->fd, &s) == -1) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot stat %d: %s", f->fd, strerror(errno));
++              RETURN_FALSE;
++      }
++
++      array_init(return_value);
++      ADD_FIELD("device", s.st_dev);
++      ADD_FIELD("inode", s.st_ino);
++      ADD_FIELD("mode", s.st_mode);
++      ADD_FIELD("nlink", s.st_nlink);
++      ADD_FIELD("uid", s.st_uid);
++      ADD_FIELD("gid", s.st_gid);
++      ADD_FIELD("device_type", s.st_rdev);
++      ADD_FIELD("size", s.st_size);
++#ifndef PHP_WIN32
++      ADD_FIELD("block_size", s.st_blksize);
++      ADD_FIELD("blocks", s.st_blocks);
++#endif
++      ADD_FIELD("atime", s.st_atime);
++      ADD_FIELD("mtime", s.st_mtime);
++      ADD_FIELD("ctime", s.st_ctime);
++}
++/* }}} */
++
++/* {{{ proto int dio_seek(resource fd, int pos, int whence)
++   Seek to pos on fd from whence */
++PHP_FUNCTION(dio_seek)
++{
++      zval     *r_fd;
++      php_fd_t *f;
++      long      offset;
++      long      whence = SEEK_SET;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|l", &r_fd, &offset, &whence) == FAILURE) {
++              return;
++      }
++
++      ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);
++
++      RETURN_LONG(lseek(f->fd, offset, whence));
++}
++/* }}} */
++
++#ifndef PHP_WIN32
++
++/* {{{ proto mixed dio_fcntl(resource fd, int cmd[, mixed arg])
++   Perform a c library fcntl on fd */
++PHP_FUNCTION(dio_fcntl)
++{
++      zval     *r_fd;
++      zval     *arg = NULL;
++      php_fd_t *f;
++      long      cmd;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|z", &r_fd, &cmd, &arg) == FAILURE) {
++              return;
++      }
++
++      ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);
++
++      switch (cmd) {
++              case F_SETLK:
++              case F_SETLKW: {
++                      zval          **element;
++                      struct flock    lk = {0};
++                      HashTable      *fh;
++
++                      if (!arg) {
++                              php_error_docref(NULL TSRMLS_CC, E_WARNING, "expects argument 3 to be array or int, none given");
++                              RETURN_FALSE;
++                      }
++                      if (Z_TYPE_P(arg) == IS_ARRAY) {
++                              fh = HASH_OF(arg);
++                              if (zend_hash_find(fh, "start", sizeof("start"), (void **) &element) == FAILURE) {
++                                      lk.l_start = 0;
++                              } else {
++                                      lk.l_start = Z_LVAL_PP(element);
++                              }
++
++                              if (zend_hash_find(fh, "length", sizeof("length"), (void **) &element) == FAILURE) {
++                                      lk.l_len = 0;
++                              } else {
++                                      lk.l_len = Z_LVAL_PP(element);
++                              }
++
++                              if (zend_hash_find(fh, "whence", sizeof("whence"), (void **) &element) == FAILURE) {
++                                      lk.l_whence = 0;
++                              } else {
++                                      lk.l_whence = Z_LVAL_PP(element);
++                              }
++
++                              if (zend_hash_find(fh, "type", sizeof("type"), (void **) &element) == FAILURE) {
++                                      lk.l_type = 0;
++                              } else {
++                                      lk.l_type = Z_LVAL_PP(element);
++                              }
++                      } else if (Z_TYPE_P(arg) == IS_LONG) {
++                              lk.l_start  = 0;
++                              lk.l_len    = 0;
++                              lk.l_whence = SEEK_SET;
++                              lk.l_type   = Z_LVAL_P(arg);
++                      } else {
++                              php_error_docref(NULL TSRMLS_CC, E_WARNING, "expects argument 3 to be array or int, %s given", zend_zval_type_name(arg));
++                              RETURN_FALSE;
++                      }
++
++                      RETURN_LONG(fcntl(f->fd, cmd, &lk));
++                      break;
++              }
++              case F_GETLK: {
++                      struct flock lk = {0};
++
++                      fcntl(f->fd, cmd, &lk);
++
++                      array_init(return_value);
++                      add_assoc_long(return_value, "type", lk.l_type);
++                      add_assoc_long(return_value, "whence", lk.l_whence);
++                      add_assoc_long(return_value, "start", lk.l_start);
++                      add_assoc_long(return_value, "length", lk.l_len);
++                      add_assoc_long(return_value, "pid", lk.l_pid);
++
++                      break;
++              }
++              case F_DUPFD: {
++                      php_fd_t *new_f;
++
++                      if (!arg || Z_TYPE_P(arg) != IS_LONG) {
++                              php_error_docref(NULL TSRMLS_CC, E_WARNING, "expects argument 3 to be int");
++                              RETURN_FALSE;
++                      }
++
++                      if (!new_php_fd(&new_f, fcntl(f->fd, cmd, Z_LVAL_P(arg)))) {
++                              RETURN_FALSE;
++                      }
++                      ZEND_REGISTER_RESOURCE(return_value, new_f, le_fd);
++                      break;
++              }
++              default:
++                      if (!arg || Z_TYPE_P(arg) != IS_LONG) {
++                              php_error_docref(NULL TSRMLS_CC, E_WARNING, "expects argument 3 to be int");
++                              RETURN_FALSE;
++                      }
++
++                      RETURN_LONG(fcntl(f->fd, cmd, Z_LVAL_P(arg)));
++      }
++}
++/* }}} */
++#endif
++
++#ifndef PHP_WIN32
++
++/* {{{ proto mixed dio_tcsetattr(resource fd,  array args )
++   Perform a c library tcsetattr on fd */
++PHP_FUNCTION(dio_tcsetattr)
++{
++      zval     *r_fd;
++      zval     *arg = NULL;
++      php_fd_t *f;
++      struct termios newtio;
++      int Baud_Rate, Data_Bits=8, Stop_Bits=1, Parity=0, Flow_Control=1, Is_Canonical=1;
++      long BAUD,DATABITS,STOPBITS,PARITYON,PARITY;
++      HashTable      *fh;
++      zval          **element;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &r_fd, &arg) == FAILURE) {
++              return;
++      }
++
++      ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);
++
++      if (Z_TYPE_P(arg) != IS_ARRAY) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING,"tcsetattr, third argument should be an associative array");
++              return;
++      }
++
++      fh = HASH_OF(arg);
++
++      if (zend_hash_find(fh, "baud", sizeof("baud"), (void **) &element) == FAILURE) {
++              Baud_Rate = 9600;
++      } else {
++              Baud_Rate = Z_LVAL_PP(element);
++      }
++
++      if (zend_hash_find(fh, "bits", sizeof("bits"), (void **) &element) == FAILURE) {
++              Data_Bits = 8;
++      } else {
++              Data_Bits = Z_LVAL_PP(element);
++      }
++
++      if (zend_hash_find(fh, "stop", sizeof("stop"), (void **) &element) == FAILURE) {
++              Stop_Bits = 1;
++      } else {
++              Stop_Bits = Z_LVAL_PP(element);
++      }
++
++      if (zend_hash_find(fh, "parity", sizeof("parity"), (void **) &element) == FAILURE) {
++              Parity = 0;
++      } else {
++              Parity = Z_LVAL_PP(element);
++      }
++
++      if (zend_hash_find(fh, "flow_control", sizeof("flow_control"), (void **) &element) == FAILURE) {
++              Flow_Control = 1;
++      } else {
++              Flow_Control = Z_LVAL_PP(element);
++      }
++
++      if (zend_hash_find(fh, "is_canonical", sizeof("is_canonical"), (void **) &element) == FAILURE) {
++              Is_Canonical = 1;
++      } else {
++              Is_Canonical = Z_LVAL_PP(element);
++      }
++
++      /* assign to correct values... */
++      switch (Baud_Rate)  {
++              case 38400:
++                      BAUD = B38400;
++                      break;
++              case 19200:
++                      BAUD = B19200;
++                      break;
++              case 9600:
++                      BAUD = B9600;
++                      break;
++              case 4800:
++                      BAUD = B4800;
++                      break;
++              case 2400:
++                      BAUD = B2400;
++                      break;
++              case 1800:
++                      BAUD = B1800;
++                      break;
++              case 1200:
++                      BAUD = B1200;
++                      break;
++              case 600:
++                      BAUD = B600;
++                      break;
++              case 300:
++                      BAUD = B300;
++                      break;
++              case 200:
++                      BAUD = B200;
++                      break;
++              case 150:
++                      BAUD = B150;
++                      break;
++              case 134:
++                      BAUD = B134;
++                      break;
++              case 110:
++                      BAUD = B110;
++                      break;
++              case 75:
++                      BAUD = B75;
++                      break;
++              case 50:
++                      BAUD = B50;
++                      break;
++              default:
++                      php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid baud rate %d", Baud_Rate);
++                      RETURN_FALSE;
++      }
++      switch (Data_Bits) {
++              case 8:
++                      DATABITS = CS8;
++                      break;
++              case 7:
++                      DATABITS = CS7;
++                      break;
++              case 6:
++                      DATABITS = CS6;
++                      break;
++              case 5:
++                      DATABITS = CS5;
++                      break;
++              default:
++                      php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid data bits %d", Data_Bits);
++                      RETURN_FALSE;
++      }
++      switch (Stop_Bits) {
++              case 1:
++                      STOPBITS = 0;
++                      break;
++              case 2:
++                      STOPBITS = CSTOPB;
++                      break;
++              default:
++                      php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid stop bits %d", Stop_Bits);
++                      RETURN_FALSE;
++      }
++
++      switch (Parity) {
++              case 0:
++                      PARITYON = 0;
++                      PARITY = 0;
++                      break;
++              case 1:
++                      PARITYON = PARENB;
++                      PARITY = PARODD;
++                      break;
++              case 2:
++                      PARITYON = PARENB;
++                      PARITY = 0;
++                      break;
++              default:
++                      php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid parity %d", Parity);
++                      RETURN_FALSE;
++      }
++
++      memset(&newtio, 0, sizeof(newtio));
++      tcgetattr(f->fd, &newtio);
++
++      if (Is_Canonical) {
++              newtio.c_iflag = IGNPAR | ICRNL;
++              newtio.c_oflag = 0;
++              newtio.c_lflag = ICANON;
++      } else {
++              cfmakeraw(&newtio);
++      }
++
++      newtio.c_cflag = BAUD | DATABITS | STOPBITS | PARITYON | PARITY | CLOCAL | CREAD;
++
++#ifdef CRTSCTS
++      if (Flow_Control) {
++              newtio.c_cflag |= CRTSCTS;
++      }
++#endif
++
++      if (Is_Canonical)
++
++      newtio.c_cc[VMIN] = 1;
++      newtio.c_cc[VTIME] = 0;
++      tcflush(f->fd, TCIFLUSH);
++      tcsetattr(f->fd,TCSANOW,&newtio);
++
++      RETURN_TRUE;
++}
++/* }}} */
++#endif
++
++/* {{{ proto void dio_close(resource fd)
++   Close the file descriptor given by fd */
++PHP_FUNCTION(dio_close)
++{
++      zval     *r_fd;
++      php_fd_t *f;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &r_fd) == FAILURE) {
++              return;
++      }
++
++      ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd);
++
++      zend_list_delete(Z_LVAL_P(r_fd));
++}
++/* }}} */
++
++#define RDIOC(c) REGISTER_LONG_CONSTANT(#c, c, CONST_CS | CONST_PERSISTENT)
++
++/* {{{ dio_init_legacy_defines
++ * Initialises the legacy PHP defines
++ */
++static void dio_init_legacy_defines(int module_number TSRMLS_DC) {
++      RDIOC(O_RDONLY);
++      RDIOC(O_WRONLY);
++      RDIOC(O_RDWR);
++      RDIOC(O_CREAT);
++      RDIOC(O_EXCL);
++      RDIOC(O_TRUNC);
++      RDIOC(O_APPEND);
++#ifdef O_NONBLOCK
++      RDIOC(O_NONBLOCK);
++#endif
++#ifdef O_NDELAY
++      RDIOC(O_NDELAY);
++#endif
++#ifdef O_SYNC
++      RDIOC(O_SYNC);
++#endif
++#ifdef O_ASYNC
++      RDIOC(O_ASYNC);
++#endif
++#ifdef O_NOCTTY
++      RDIOC(O_NOCTTY);
++#endif
++#ifndef PHP_WIN32
++      RDIOC(S_IRWXU);
++      RDIOC(S_IRUSR);
++      RDIOC(S_IWUSR);
++      RDIOC(S_IXUSR);
++      RDIOC(S_IRWXG);
++      RDIOC(S_IRGRP);
++      RDIOC(S_IWGRP);
++      RDIOC(S_IXGRP);
++      RDIOC(S_IRWXO);
++      RDIOC(S_IROTH);
++      RDIOC(S_IWOTH);
++      RDIOC(S_IXOTH);
++      RDIOC(F_DUPFD);
++      RDIOC(F_GETFD);
++      RDIOC(F_GETFL);
++      RDIOC(F_SETFL);
++      RDIOC(F_GETLK);
++      RDIOC(F_SETLK);
++      RDIOC(F_SETLKW);
++      RDIOC(F_SETOWN);
++      RDIOC(F_GETOWN);
++      RDIOC(F_UNLCK);
++      RDIOC(F_RDLCK);
++      RDIOC(F_WRLCK);
++#endif
++}
++
++ZEND_BEGIN_ARG_INFO_EX(dio_open_args, 0, 0, 2)
++      ZEND_ARG_INFO(0, filename)
++      ZEND_ARG_INFO(0, flags)
++      ZEND_ARG_INFO(0, mode)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(dio_read_args, 0, 0, 1)
++      ZEND_ARG_INFO(0, fd)
++      ZEND_ARG_INFO(0, n)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(dio_write_args, 0, 0, 2)
++      ZEND_ARG_INFO(0, fd)
++      ZEND_ARG_INFO(0, data)
++      ZEND_ARG_INFO(0, len)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(dio_stat_args, 0, 0, 1)
++      ZEND_ARG_INFO(0, fd)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(dio_truncate_args, 0, 0, 2)
++      ZEND_ARG_INFO(0, fd)
++      ZEND_ARG_INFO(0, offset)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(dio_seek_args, 0, 0, 3)
++      ZEND_ARG_INFO(0, fd)
++      ZEND_ARG_INFO(0, pos)
++      ZEND_ARG_INFO(0, whence)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(dio_fcntl_args, 0, 0, 2)
++      ZEND_ARG_INFO(0, fd)
++      ZEND_ARG_INFO(0, cmd)
++      ZEND_ARG_INFO(0, arg)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(dio_tcsetattr_args, 0, 0, 2)
++      ZEND_ARG_INFO(0, fd)
++      ZEND_ARG_INFO(0, args)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(dio_close_args, 0, 0, 1)
++      ZEND_ARG_INFO(0, fd)
++ZEND_END_ARG_INFO()
++
++/*
++   +----------------------------------------------------------------------+
++   |                   END OF DEPRECATED FUNCTIONALITY                    |
++   +----------------------------------------------------------------------+
++ */
++
++ZEND_BEGIN_ARG_INFO_EX(dio_raw_args, 0, 0, 2)
++      ZEND_ARG_INFO(0, filename)
++      ZEND_ARG_INFO(0, mode)
++      ZEND_ARG_INFO(0, options)
++ZEND_END_ARG_INFO()
++
++ZEND_BEGIN_ARG_INFO_EX(dio_serial_args, 0, 0, 2)
++      ZEND_ARG_INFO(0, filename)
++      ZEND_ARG_INFO(0, mode)
++      ZEND_ARG_INFO(0, options)
++ZEND_END_ARG_INFO()
++
++static zend_object_handlers dio_raw_object_handlers;
++
++static function_entry dio_functions[] = {
++      /* Class functions. */
++
++      /* Legacy functions (Deprecated - See dio_legacy.c) */
++      PHP_FE(dio_open, dio_open_args)
++#ifndef PHP_WIN32
++      PHP_FE(dio_truncate, dio_truncate_args)
++#endif
++      PHP_FE(dio_stat, dio_stat_args)
++      PHP_FE(dio_seek, dio_seek_args)
++#ifndef PHP_WIN32
++      PHP_FE(dio_fcntl, dio_fcntl_args)
++#endif
++      PHP_FE(dio_read, dio_read_args)
++      PHP_FE(dio_write, dio_write_args)
++      PHP_FE(dio_close, dio_close_args)
++#ifndef PHP_WIN32
++      PHP_FE(dio_tcsetattr, dio_tcsetattr_args)
++#endif
++
++      /* Stream functions */
++      PHP_FE(dio_raw, dio_raw_args)
++      PHP_FE(dio_serial, dio_serial_args)
++
++      /* End of functions */
++      {NULL, NULL, NULL}
++};
++
++zend_module_entry dio_module_entry = {
++      STANDARD_MODULE_HEADER,
++      "dio",
++      dio_functions,
++      PHP_MINIT(dio),
++      NULL,
++      NULL,   
++      NULL,
++      PHP_MINFO(dio),
++      PHP_DIO_VERSION,
++      STANDARD_MODULE_PROPERTIES
++};
++
++#ifdef COMPILE_DL_DIO
++ZEND_GET_MODULE(dio)
++#endif
++
++#define DIO_UNDEF_CONST -1
++
++/* {{{ PHP_MINIT_FUNCTION
++ */
++PHP_MINIT_FUNCTION(dio)
++{
++      /* Legacy resource destructor. */
++      le_fd = zend_register_list_destructors_ex(_dio_close_fd, NULL, le_fd_name, module_number);
++
++      dio_init_legacy_defines(module_number TSRMLS_CC);
++
++      /* Register the stream wrappers */
++      return (php_register_url_stream_wrapper(DIO_RAW_STREAM_NAME, &php_dio_raw_stream_wrapper TSRMLS_CC) == SUCCESS &&
++                      php_register_url_stream_wrapper(DIO_SERIAL_STREAM_NAME, &php_dio_serial_stream_wrapper TSRMLS_CC) == SUCCESS) ? SUCCESS : FAILURE;
++}
++/* }}} */
++
++/* {{{ PHP_MSHUTDOWN_FUNCTION
++ */
++PHP_MSHUTDOWN_FUNCTION(dio)
++{
++      return (php_unregister_url_stream_wrapper(DIO_RAW_STREAM_NAME TSRMLS_CC) == SUCCESS &&
++                      php_unregister_url_stream_wrapper(DIO_SERIAL_STREAM_NAME TSRMLS_CC) == SUCCESS) ? SUCCESS : FAILURE;
++}
++/* }}} */
++
++/* {{{ PHP_MINFO_FUNCTION
++ */
++PHP_MINFO_FUNCTION(dio)
++{
++      php_info_print_table_start();
++      php_info_print_table_header(2, "dio support", "enabled");
++      php_info_print_table_row(2, "version", PHP_DIO_VERSION);
++      php_info_print_table_end();
++}
++/* }}} */
++
++/*
++ * Local variables:
++ * c-basic-offset: 4
++ * tab-width: 4
++ * End:
++ * vim600: fdm=marker
++ * vim: sw=4 ts=4 noet
++ */
+--- /dev/null
++++ b/ext/dio/dio_common.c
+@@ -0,0 +1,230 @@
++/*
++   +----------------------------------------------------------------------+
++   | PHP Version 5                                                        |
++   +----------------------------------------------------------------------+
++   | Copyright (c) 2009 Melanie Rhianna Lewis                             |
++   +----------------------------------------------------------------------+
++   | This source file is subject to version 3.0 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:           |
++   | http://www.php.net/license/3_0.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.               |
++   +----------------------------------------------------------------------+
++   | Author: Melanie Rhianna Lewis <cyberspice@php.net>                   |
++   +----------------------------------------------------------------------+
++ */
++
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#include "php.h"
++
++#include "php_dio.h"
++#include "php_dio_common.h"
++
++/* {{{ dio_init_stream_data
++ * Initialises the command parts of the stream data.
++ */
++void dio_init_stream_data(php_dio_stream_data *data) {
++      data->stream_type = DIO_STREAM_TYPE_NONE;
++      data->end_of_file = 0;
++#ifdef DIO_HAS_FILEPERMS
++      data->has_perms = 0;
++      data->perms = 0;
++#endif
++#ifdef DIO_NONBLOCK
++      data->is_blocking = 1;
++      data->has_timeout = 0;
++      data->timeout_sec = 0;
++      data->timeout_usec = 0;
++      data->timed_out = 0;
++#endif
++      /* Serial options */
++      data->data_rate = 9600;
++      data->data_bits = 8;
++      data->stop_bits = 1;
++      data->parity = 0;
++      data->flow_control = 1;
++      data->canonical = 1;
++}
++/* }}} */
++
++/* {{{ dio_convert_to_long
++ * Returns as a long, the value of the zval regardless of its type.
++ */
++long dio_convert_to_long(zval *val) {
++      zval *copyval;
++      long  longval;
++
++      ALLOC_INIT_ZVAL(copyval);
++      *copyval = *val;
++      convert_to_long(copyval);
++      longval = Z_LVAL_P(copyval);
++      zval_ptr_dtor(&copyval);
++
++      return longval;
++}
++/* }}} */
++
++/* {{{ dio_assoc_array_get_basic_options
++ * Retrieves the basic open option values from an associative array
++ */
++void dio_assoc_array_get_basic_options(zval *options, php_dio_stream_data *data TSRMLS_DC) {
++#if defined(DIO_HAS_FILEPERMS) || defined(DIO_NONBLOCK)
++      zval **tmpzval;
++      HashTable *opthash;
++
++      opthash = HASH_OF(options);
++#endif
++
++#ifdef DIO_HAS_FILEPERMS
++      /* This is the file mode flags used by open(). */
++      if (zend_hash_find(opthash, "perms", sizeof("perms"), (void **)&tmpzval) == SUCCESS && tmpzval && *tmpzval) {
++              data->perms = (int)dio_convert_to_long(*tmpzval);
++              data->has_perms = 1;
++      }
++#endif
++
++#ifdef DIO_NONBLOCK
++      /* This sets the underlying stream to be blocking/non
++         block (i.e. O_NONBLOCK) */
++      if (zend_hash_find(opthash, "is_blocking", sizeof("is_blocking"), (void **)&tmpzval) == SUCCESS && tmpzval && *tmpzval) {
++              data->is_blocking = dio_convert_to_long(*tmpzval) ? 1 : 0;
++      }
++
++      /* This is the timeout value for reads in seconds.  Only one of
++         timeout_secs or timeout_usecs need be defined to define a timeout. */
++      if (zend_hash_find(opthash, "timeout_secs", sizeof("timeout_secs"), (void **)&tmpzval) == SUCCESS && tmpzval && *tmpzval) {
++              data->timeout_sec = dio_convert_to_long(*tmpzval);
++      }
++
++      /* This is the timeout value for reads in microseconds.  Only one of
++         timeout_secs or timeout_usecs need be defined to define a timeout. */
++      if (zend_hash_find(opthash, "timeout_usecs", sizeof("timeout_usecs"), (void **)&tmpzval) == SUCCESS && tmpzval && *tmpzval) {
++              data->timeout_usec = dio_convert_to_long(*tmpzval);
++      }
++
++      data->has_timeout = (data->timeout_sec | data->timeout_usec) ? 1 : 0;
++#endif
++}
++/* }}} */
++
++/* {{{ dio_assoc_array_get_serial_options
++ * Retrieves the serial open option values from an associative array
++ */
++void dio_assoc_array_get_serial_options(zval *options, php_dio_stream_data *data TSRMLS_DC) {
++      zval **tmpzval;
++      HashTable *opthash;
++
++      opthash = HASH_OF(options);
++
++      if (zend_hash_find(opthash, "data_rate", sizeof("data_rate"), (void **)&tmpzval) == SUCCESS && tmpzval && *tmpzval) {
++              data->data_rate = dio_convert_to_long(*tmpzval);
++      }
++
++      if (zend_hash_find(opthash, "data_bits", sizeof("data_bits"), (void **)&tmpzval) == SUCCESS && tmpzval && *tmpzval) {
++              data->data_bits = (int)dio_convert_to_long(*tmpzval);
++      }
++
++      if (zend_hash_find(opthash, "stop_bits", sizeof("stop_bits"), (void **)&tmpzval) == SUCCESS && tmpzval && *tmpzval) {
++              data->stop_bits = (int)dio_convert_to_long(*tmpzval);
++      }
++
++      if (zend_hash_find(opthash, "parity", sizeof("parity"), (void **)&tmpzval) == SUCCESS && tmpzval && *tmpzval) {
++              data->parity = (int)dio_convert_to_long(*tmpzval);
++      }
++
++      if (zend_hash_find(opthash, "flow_control", sizeof("flow_control"), (void **)&tmpzval) == SUCCESS && tmpzval && *tmpzval) {
++              data->flow_control = (int)(dio_convert_to_long(*tmpzval) ? 1 : 0);
++      }
++
++      if (zend_hash_find(opthash, "is_canonical", sizeof("is_canonical"), (void **)&tmpzval) == SUCCESS && tmpzval && *tmpzval) {
++              data->canonical = (int)(dio_convert_to_long(*tmpzval) ? 1 : 0);
++      }
++}
++/* }}} */
++
++/* {{{ dio_stream_context_get_raw_options
++ * Extracts the option values for dio.raw mode from a context
++ */
++void dio_stream_context_get_basic_options(php_stream_context *context, php_dio_stream_data *data TSRMLS_DC) {
++#if defined(DIO_HAS_FILEPERMS) || defined(DIO_NONBLOCK)
++      zval **tmpzval;
++#endif
++
++#ifdef DIO_HAS_FILEPERMS
++      /* This is the file mode flags used by open(). */
++      if (php_stream_context_get_option(context, "dio", "perms", &tmpzval) == SUCCESS && tmpzval && *tmpzval) {
++              data->perms = (int)dio_convert_to_long(*tmpzval);
++              data->has_perms = 1;
++      }
++#endif
++
++#ifdef DIO_NONBLOCK
++      /* This sets the underlying stream to be blocking/non
++         block (i.e. O_NONBLOCK) */
++      if (php_stream_context_get_option(context, "dio", "is_blocking", &tmpzval) == SUCCESS && tmpzval && *tmpzval) {
++              data->is_blocking = dio_convert_to_long(*tmpzval) ? 1 : 0;
++      }
++
++      /* This is the timeout value for reads in seconds.  Only one of
++         timeout_secs or timeout_usecs need be defined to define a timeout. */
++      if (php_stream_context_get_option(context, "dio", "timeout_secs", &tmpzval) == SUCCESS && tmpzval && *tmpzval) {
++              data->timeout_sec = dio_convert_to_long(*tmpzval);
++      }
++
++      /* This is the timeout value for reads in microseconds.  Only one of
++         timeout_secs or timeout_usecs need be defined to define a timeout. */
++      if (php_stream_context_get_option(context, "dio", "timeout_usecs", &tmpzval) == SUCCESS && tmpzval && *tmpzval) {
++              data->timeout_usec = dio_convert_to_long(*tmpzval);
++      }
++
++      data->has_timeout = (data->timeout_sec | data->timeout_usec) ? 1 : 0;
++#endif
++}
++/* }}} */
++
++/* {{{ dio_stream_context_get_serial_options
++ * Extracts the option values for dio.serial mode from a context
++ */
++void dio_stream_context_get_serial_options(php_stream_context *context, php_dio_stream_data *data TSRMLS_DC) {
++      zval **tmpzval;
++
++      if (php_stream_context_get_option(context, "dio", "data_rate", &tmpzval) == SUCCESS && tmpzval && *tmpzval) {
++              data->data_rate = dio_convert_to_long(*tmpzval);
++      }
++
++      if (php_stream_context_get_option(context, "dio", "data_bits", &tmpzval) == SUCCESS && tmpzval && *tmpzval) {
++              data->data_bits = (int)dio_convert_to_long(*tmpzval);
++      }
++
++      if (php_stream_context_get_option(context, "dio", "stop_bits", &tmpzval) == SUCCESS && tmpzval && *tmpzval) {
++              data->stop_bits = (int)dio_convert_to_long(*tmpzval);
++      }
++
++      if (php_stream_context_get_option(context, "dio", "parity", &tmpzval) == SUCCESS && tmpzval && *tmpzval) {
++              data->parity = (int)dio_convert_to_long(*tmpzval);
++      }
++
++      if (php_stream_context_get_option(context, "dio", "flow_control", &tmpzval) == SUCCESS && tmpzval && *tmpzval) {
++              data->flow_control = (int)(dio_convert_to_long(*tmpzval) ? 1 : 0);
++      }
++
++      if (php_stream_context_get_option(context, "dio", "is_canonical", &tmpzval) == SUCCESS && tmpzval && *tmpzval) {
++              data->canonical = (int)(dio_convert_to_long(*tmpzval) ? 1 : 0);
++      }
++}
++/* }}} */
++
++/*
++ * Local variables:
++ * c-basic-offset: 4
++ * tab-width: 4
++ * End:
++ * vim600: fdm=marker
++ * vim: sw=4 ts=4 noet
++ */
++
+--- /dev/null
++++ b/ext/dio/dio_posix.c
+@@ -0,0 +1,659 @@
++/*
++   +----------------------------------------------------------------------+
++   | PHP Version 5                                                        |
++   +----------------------------------------------------------------------+
++   | Copyright (c) 2009 Melanie Rhianna Lewis                             |
++   +----------------------------------------------------------------------+
++   | This source file is subject to version 3.0 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:           |
++   | http://www.php.net/license/3_0.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.               |
++   +----------------------------------------------------------------------+
++   | Author: Melanie Rhianna Lewis <cyberspice@php.net>                   |
++   +----------------------------------------------------------------------+
++ */
++
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#include "php.h"
++
++#include "php_dio_common.h"
++
++/* {{{ dio_stream_mode_to_flags
++ * Convert an fopen() mode string to open() flags
++ */
++static int dio_stream_mode_to_flags(const char *mode) {
++      int  flags = 0, ch = 0, bin = 1;
++
++      switch(mode[ch++]) {
++              case 'r':
++                      flags = 0;
++                      break;
++              case 'w':
++                      flags = O_TRUNC | O_CREAT;
++                      break;
++              case 'a':
++                      flags = O_APPEND | O_CREAT;
++                      break;
++              case 'x':
++                      flags = O_EXCL | O_CREAT;
++                      break;
++      }
++
++      if (mode[ch] != '+') {
++              bin = (mode[ch++] == 'b');
++      }
++
++      if (mode[ch] == '+') {
++              flags |= O_RDWR;
++      } else if (flags) {
++              flags |= O_WRONLY;
++      } else {
++              flags |= O_RDONLY;
++      }
++
++#if defined(_O_TEXT) && defined(O_BINARY)
++      if (bin) {
++              flags |= O_BINARY;
++      } else {
++              flags |= _O_TEXT;
++      }
++#endif
++
++      return flags;
++}
++/* }}} */
++
++/* {{{ dio_data_rate_to_define
++ * Converts a numeric data rate to a termios define
++ */
++static int dio_data_rate_to_define(long rate, speed_t *def) {
++      speed_t val;
++
++      switch (rate) {
++              case 0:
++                      val = 0;
++                      break;
++              case 50:
++                      val = B50;
++                      break;
++              case 75:
++                      val = B75;
++                      break;
++              case 110:
++                      val = B110;
++                      break;
++              case 134:
++                      val = B134;
++                      break;
++              case 150:
++                      val = B150;
++                      break;
++              case 200:
++                      val = B200;
++                      break;
++              case 300:
++                      val = B300;
++                      break;
++              case 600:
++                      val = B600;
++                      break;
++              case 1200:
++                      val = B1200;
++                      break;
++              case 1800:
++                      val = B1800;
++                      break;
++              case 2400:
++                      val = B2400;
++                      break;
++              case 4800:
++                      val = B4800;
++                      break;
++              case 9600:
++                      val = B9600;
++                      break;
++              case 19200:
++                      val = B19200;
++                      break;
++              case 38400:
++                      val = B38400;
++                      break;
++#ifdef B57600
++              case 57600:
++                      val = B57600;
++                      break;
++#endif
++#ifdef B115200
++              case 115200:
++                      val = B115200;
++                      break;
++#endif
++#ifdef B230400
++              case 230400:
++                      val = B230400;
++                      break;
++#endif
++#ifdef B460800
++              case 460800:
++                      val = B460800;
++                      break;
++#endif
++              default:
++                      return 0;
++      }
++
++      *def = val;
++      return 1;
++}
++
++/* {{{ dio_data_bits_to_define
++ * Converts a number of data bits to a termios define
++ */
++static int dio_data_bits_to_define(int data_bits, int *def) {
++      int val;
++
++      switch (data_bits) {
++              case 8:
++                      val = CS8;
++                      break;
++              case 7:
++                      val = CS7;
++                      break;
++              case 6:
++                      val = CS6;
++                      break;
++              case 5:
++                      val = CS5;
++                      break;
++              default:
++                      return 0;
++      }
++
++      *def = val;
++      return 1;
++}
++/* }}} */
++
++/* {{{ dio_stop_bits_to_define
++ * Converts a number of stop bits to a termios define
++ */
++static int dio_stop_bits_to_define(int stop_bits, int *def) {
++      int val;
++
++      switch (stop_bits) {
++              case 1:
++                      val = 0;
++                      break;
++              case 2:
++                      val = CSTOPB;
++                      break;
++              default:
++                      return 0;
++      }
++
++      *def = val;
++      return 1;
++}
++/* }}} */
++
++/* {{{ dio_parity_to_define
++ * Converts a parity type to a termios define
++ */
++static int dio_parity_to_define(int parity, int *def) {
++      int val;
++
++      switch (parity) {
++              case 0:
++                      val = 0;
++                      break;
++              case 1:
++                      val = PARENB | PARODD;
++                      break;
++              case 2:
++                      val = PARENB;
++                      break;
++              default:
++                      return 0;
++      }
++
++      *def = val;
++      return 1;
++}
++/* }}} */
++
++/* {{{ dio_create_stream_data
++ * Creates an initialised stream data structure.  Free with efree().
++ */
++php_dio_stream_data * dio_create_stream_data(void) {
++      php_dio_posix_stream_data * data = emalloc(sizeof(php_dio_posix_stream_data));
++      dio_init_stream_data(&(data->common));
++      data->fd = -1;
++      data->flags = 0;
++
++      return (php_dio_stream_data *)data;
++}
++/* }}} */
++
++/* {{{ dio_common_write
++ * Writes count chars from the buffer to the stream described by the stream data.
++ */
++size_t dio_common_write(php_dio_stream_data *data, const char *buf, size_t count) {
++      size_t ret;
++
++      /* Blocking writes can be interrupted by signals etc. If
++       * interrupted try again. Not sure about non-blocking
++       * writes but it doesn't hurt to check. */
++      do {
++              ret = write(((php_dio_posix_stream_data*)data)->fd, buf, count);
++              if (ret > 0) {
++                      return ret;
++              }
++      } while (errno == EINTR);
++      return 0;
++}
++/* }}} */
++
++#ifdef DIO_NONBLOCK
++/* {{{ dio_timeval_subtract
++ * Calculates the difference between two timevals returning the result in the
++ * structure pointed to by diffptr.  Returns -1 as error if late time is
++ * earlier than early time.
++ */
++static int dio_timeval_subtract(struct timeval *late, struct timeval *early, struct timeval *diff) {
++      struct timeval *tmp;
++
++      /* Handle negatives */
++      if (late->tv_sec < early->tv_sec) {
++              return 0;
++      }
++
++      if ((late->tv_sec == early->tv_sec) && (late->tv_usec < early->tv_usec)) {
++              return 0;
++      }
++
++      /* Handle any carry.  If later usec is smaller than earlier usec simple
++       * subtraction will result in negative value.  Since usec has a maximum
++       * of one second by adding another second before the subtraction the
++       * result will always be positive. */
++      if (late->tv_usec < early->tv_usec) {
++              late->tv_usec  += 1000000;
++              late->tv_sec--;
++      }
++
++      /* Once adjusted can just subtract values. */
++      diff->tv_sec  = late->tv_sec  - early->tv_sec;
++      diff->tv_usec = late->tv_usec - early->tv_usec;
++
++      return 1;
++}
++#endif
++
++/* {{{ dio_common_read
++ * Reads count chars to the buffer to the stream described by the stream data.
++ */
++size_t dio_common_read(php_dio_stream_data *data, const char *buf, size_t count) {
++      int fd = ((php_dio_posix_stream_data*)data)->fd;
++      size_t ret, total = 0;
++      char *ptr = (char*)buf;
++
++      struct timeval timeout, timeouttmp, before, after, diff;
++      fd_set rfds;
++
++      if (!data->has_timeout) {
++              /* Blocking reads can be interrupted by signals etc. If
++               * interrupted try again. Not sure about non-blocking
++               * reads but it doesn't hurt to check. */
++              do {
++                      ret = read(fd, (char*)ptr, count);
++                      if (ret > 0) {
++                              return ret;
++                      } else if (!ret) {
++                              data->end_of_file = 1;
++                      }
++              } while ((errno == EINTR) && !data->end_of_file);
++              return 0;
++      }
++#ifdef DIO_NONBLOCK
++      else {
++              /* Clear timed out flag */
++              data->timed_out = 0;
++
++              /* The initial timeout value */
++              timeout.tv_sec  = data->timeout_sec;
++              timeout.tv_usec = data->timeout_usec;
++
++              do {
++                      /* The semantics of select() are that you cannot guarantee
++                       * that the timeval structure passed in has not been changed by
++                       * the select call.  So you keep a copy. */
++                      timeouttmp = timeout;
++
++                      /* The time before we wait for data. */
++                      (void) gettimeofday(&before, NULL);
++
++                      /* Wait for an event on our file descriptor. */
++                      FD_ZERO(&rfds);
++                      FD_SET(fd, &rfds);
++
++                      ret = select(fd + 1, &rfds, NULL, NULL, &timeouttmp);
++                      /* An error. */
++                      if ((ret < 0) && (errno != EINTR) && (errno != EAGAIN)) {
++                              return 0;
++                      }
++
++                      /* We have data to read. */
++                      if ((ret > 0) && FD_ISSET(fd, &rfds)) {
++                              ret = read(fd, ptr, count);
++                              /* Another error */
++                              if ((ret < 0) && (errno != EINTR) && (errno != EAGAIN)) {
++                                      return 0;
++                              }
++
++                              if (ret > 0) {
++                                      /* Got data, add it to the buffer. */
++                                      ptr   += ret;
++                                      total += ret;
++                                      count -= ret;
++                              } else if (!ret) {
++                                      /* This should never happen since how can we have
++                                       * data to read at an end of file, but still
++                                       * just in case! */
++                                      data->end_of_file = 1;
++                                      break;
++                              }
++                      }
++
++                      /* If not timed out and not end of file and not all data read
++                       * calculate how long it took us and loop if we still have time
++                       * out time left. */
++                      if (count) {
++                              (void) gettimeofday(&after, NULL);
++
++                              /* Diff the timevals */
++                              (void) dio_timeval_subtract(&after, &before, &diff);
++
++                              /* Now adjust the timeout. */
++                              if (!dio_timeval_subtract(&timeout, &diff, &timeout)) {
++                                      /* If it errors we've run out of time. */
++                                      data->timed_out = 1;
++                                      break;
++                              } else if (!timeout.tv_sec && !(timeout.tv_usec / 1000)) {
++                                      /* Check for rounding issues (millisecond accuracy) */
++                                      data->timed_out = 1;
++                                      break;
++                              }
++                      }
++              } while (count); /* Until time out or end of file or all data read. */
++
++              return total;
++      }
++#endif
++}
++/* }}} */
++
++/* {{{ php_dio_stream_data
++ * Closes the php_stream.
++ */
++int dio_common_close(php_dio_stream_data *data) {
++      if (close(((php_dio_posix_stream_data*)data)->fd) < 0) {
++              return 0;
++      }
++
++      return 1;
++}
++/* }}} */
++
++/* {{{ dio_common_set_option
++ * Sets/gets stream options
++ */
++int dio_common_set_option(php_dio_stream_data *data, int option, int value, void *ptrparam) {
++      int fd = ((php_dio_posix_stream_data*)data)->fd;
++      int old_is_blocking;
++      int flags;
++
++      switch (option) {
++#ifdef DIO_NONBLOCK
++              case PHP_STREAM_OPTION_READ_TIMEOUT:
++                      if (ptrparam) {
++                              struct timeval *tv = (struct timeval*)ptrparam;
++
++                              flags = fcntl(fd, F_GETFL, 0);
++
++                              /* A timeout of zero seconds and zero microseconds disables
++                                 any existing timeout. */
++                              if (tv->tv_sec || tv->tv_usec) {
++                                      data->timeout_sec = tv->tv_sec;
++                                      data->timeout_usec = tv->tv_usec;
++                                      data->has_timeout = -1;
++                                      (void) fcntl(fd, F_SETFL, flags & ~DIO_NONBLOCK);
++                              } else {
++                                      data->timeout_sec = 0;
++                                      data->timeout_usec = 0;
++                                      data->has_timeout = 0;
++                                      data->timed_out = 0;
++                                      (void) fcntl(fd, F_SETFL, flags | DIO_NONBLOCK);
++                              }
++
++                              return PHP_STREAM_OPTION_RETURN_OK;
++                      } else {
++                              return PHP_STREAM_OPTION_RETURN_ERR;
++                      }
++
++              case PHP_STREAM_OPTION_BLOCKING:
++                      flags = fcntl(fd, F_GETFL, 0);
++                      if (value) {
++                              flags &= ~DIO_NONBLOCK;
++                      } else {
++                              flags |= DIO_NONBLOCK;
++                      }
++                      (void) fcntl(fd, F_SETFL, flags);
++
++                      old_is_blocking = data->is_blocking;
++                      data->is_blocking = value;
++                      return old_is_blocking ? PHP_STREAM_OPTION_RETURN_OK : PHP_STREAM_OPTION_RETURN_ERR;
++#endif /* O_NONBLOCK */
++
++              default:
++                      break;
++      }
++
++      return 1;
++}
++/* }}} */
++
++/* {{{ dio_raw_open_stream
++ * Opens the underlying stream.
++ */
++int dio_raw_open_stream(char *filename, char *mode, php_dio_stream_data *data TSRMLS_DC) {
++      php_dio_posix_stream_data *pdata = (php_dio_posix_stream_data*)data;
++      pdata->flags = dio_stream_mode_to_flags(mode);
++
++#ifdef DIO_NONBLOCK
++      if (!data->is_blocking || data->has_timeout) {
++              pdata->flags |= DIO_NONBLOCK;
++      }
++#endif
++
++      /* Open the file and handle any errors. */
++#ifdef DIO_HAS_FILEPERMS
++      if (data->has_perms) {
++              pdata->fd = open(filename, pdata->flags, (mode_t)data->perms);
++      } else {
++              pdata->fd = open(filename, pdata->flags);
++      }
++#else
++      pdata->fd = open(filename, pdata->flags);
++#endif
++
++      if (pdata->fd < 0) {
++              switch (errno) {
++                      case EEXIST:
++                              php_error_docref(NULL TSRMLS_CC, E_WARNING, "File exists!");
++                              return 0;
++                      default:
++                              return 0;
++              }
++      }
++
++      return 1;
++}
++/* }}} */
++
++/* {{{ dio_serial_init
++ * Initialises the serial settings storing the original settings before hand.
++ */
++static int dio_serial_init(php_dio_stream_data *data TSRMLS_DC) {
++      php_dio_posix_stream_data *pdata = (php_dio_posix_stream_data*)data;
++      int ret = 0, data_bits_def, stop_bits_def, parity_def;
++      struct termios tio;
++      speed_t rate_def;
++
++      if (!dio_data_rate_to_define(data->data_rate, &rate_def)) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid data_rate value (%ld)", data->data_rate);
++              return 0;
++      }
++
++      if (!dio_data_bits_to_define(data->data_bits, &data_bits_def)) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid data_bits value (%d)", data->data_bits);
++              return 0;
++      }
++
++      if (!dio_stop_bits_to_define(data->stop_bits, &stop_bits_def)) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid stop_bits value (%d)", data->stop_bits);
++              return 0;
++      }
++
++      if (!dio_parity_to_define(data->parity, &parity_def)) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid parity value (%d)", data->parity);
++              return 0;
++      }
++
++      ret = tcgetattr(pdata->fd, &(pdata->oldtio));
++      if (ret < 0) {
++              if ((errno == ENOTTY) || (errno == ENODEV)) {
++                      php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not a serial port or terminal!");
++              }
++              return 0;
++      }
++
++      ret = tcgetattr(pdata->fd, &tio);
++      if (ret < 0) {
++              return 0;
++      }
++
++      if (data->canonical) {
++              tio.c_iflag = IGNPAR | ICRNL;
++              tio.c_oflag = 0;
++              tio.c_lflag = ICANON;
++      } else {
++              cfmakeraw(&tio);
++      }
++
++      cfsetispeed(&tio, rate_def);
++      cfsetospeed(&tio, rate_def);
++
++      tio.c_cflag &= ~CSIZE;
++      tio.c_cflag |= data_bits_def;
++      tio.c_cflag &= ~CSTOPB;
++      tio.c_cflag |= stop_bits_def;
++      tio.c_cflag &= ~(PARENB|PARODD);
++      tio.c_cflag |= parity_def;
++
++#ifdef CRTSCTS
++      tio.c_cflag &= ~(CLOCAL | CRTSCTS);
++#else
++      tio.c_cflag &= ~CLOCAL;
++#endif
++      if (!data->flow_control) {
++              tio.c_cflag |= CLOCAL;
++#ifdef CRTSCTS
++      } else {
++              tio.c_cflag |= CRTSCTS;
++#endif
++      }
++
++      ret = tcsetattr(pdata->fd, TCSANOW, &tio);
++      if (ret < 0) {
++              return 0;
++      }
++
++      return 1;
++}
++/* }}} */
++
++/* {{{ dio_serial_uninit
++ * Restores the serial settings back to their original state.
++ */
++int dio_serial_uninit(php_dio_stream_data *data) {
++      php_dio_posix_stream_data *pdata = (php_dio_posix_stream_data*)data;
++      int ret;
++
++      do {
++              ret = tcsetattr(pdata->fd, TCSANOW, &(pdata->oldtio));
++      } while ((ret < 0) && (errno == EINTR));
++
++      return 1;
++}
++/* }}} */
++
++/* {{{ dio_serial_flush
++ * Purges the serial buffers of data.
++ */
++int dio_serial_purge(php_dio_stream_data *data) {
++      php_dio_posix_stream_data *pdata = (php_dio_posix_stream_data*)data;
++      int ret;
++
++      if ((pdata->flags & O_RDWR) == O_RDWR) {
++              ret = tcflush(pdata->fd, TCIOFLUSH);
++      } else if ((pdata->flags & O_WRONLY) == O_WRONLY) {
++              ret = tcflush(pdata->fd, TCOFLUSH);
++      } else if ((pdata->flags & O_RDONLY) == O_RDONLY) {
++              ret = tcflush(pdata->fd, TCIFLUSH);
++      }
++
++      if (ret < 0) {
++              return 0;
++      }
++
++      return 1;
++}
++/* }}} */
++
++/* {{{ dio_serial_open_stream
++ * Opens the underlying stream.
++ */
++int dio_serial_open_stream(char *filename, char *mode, php_dio_stream_data *data TSRMLS_DC) {
++      php_dio_posix_stream_data *pdata = (php_dio_posix_stream_data*)data;
++
++#ifdef O_NOCTTY
++      /* We don't want a controlling TTY */
++      pdata->flags |= O_NOCTTY;
++#endif
++
++      if (!dio_raw_open_stream(filename, mode, data TSRMLS_CC)) {
++              return 0;
++      }
++
++      if (!dio_serial_init(data TSRMLS_CC)) {
++              close(pdata->fd);
++              return 0;
++      }
++
++      return 1;
++}
++/* }}} */
++
++/*
++ * Local variables:
++ * c-basic-offset: 4
++ * tab-width: 4
++ * End:
++ * vim600: fdm=marker
++ * vim: sw=4 ts=4 noet
++ */
+--- /dev/null
++++ b/ext/dio/dio_stream_wrappers.c
+@@ -0,0 +1,410 @@
++/*
++   +----------------------------------------------------------------------+
++   | PHP Version 5                                                        |
++   +----------------------------------------------------------------------+
++   | Copyright (c) 2009 Melanie Rhianna Lewis                             |
++   +----------------------------------------------------------------------+
++   | This source file is subject to version 3.0 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:           |
++   | http://www.php.net/license/3_0.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.               |
++   +----------------------------------------------------------------------+
++   | Author: Melanie Rhianna Lewis <cyberspice@php.net>                   |
++   +----------------------------------------------------------------------+
++ */
++
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#include "php.h"
++#include "ext/standard/url.h"
++
++#include "php_dio.h"
++#include "php_dio_common.h"
++#include "php_dio_stream_wrappers.h"
++
++/*
++   +----------------------------------------------------------------------+
++   | Raw stream handling                                                  |
++   +----------------------------------------------------------------------+
++*/
++
++/* {{{ dio_stream_write
++ * Write to the stream
++ */
++static size_t dio_stream_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC)
++{
++      return dio_common_write((php_dio_stream_data*)stream->abstract, buf, count);
++}
++/* }}} */
++
++/* {{{ dio_stream_read
++ * Read from the stream
++ */
++static size_t dio_stream_read(php_stream *stream, char *buf, size_t count TSRMLS_DC)
++{
++      php_dio_stream_data* data = (php_dio_stream_data*)stream->abstract;
++      size_t bytes = dio_common_read(data, buf, count);
++      stream->eof = data->end_of_file;
++
++      return bytes;
++}
++/* }}} */
++
++/* {{{ dio_stream_flush
++ * Flush the stream.  For raw streams this does nothing.
++ */
++static int dio_stream_flush(php_stream *stream TSRMLS_DC)
++{
++      return 1;
++}
++/* }}} */
++
++/* {{{ dio_stream_close
++ * Close the stream
++ */
++static int dio_stream_close(php_stream *stream, int close_handle TSRMLS_DC)
++{
++      php_dio_stream_data *abstract = (php_dio_stream_data*)stream->abstract;
++
++      if (!dio_common_close(abstract)) {
++              return 0;
++      }
++
++      efree(abstract);
++      return 1;
++}
++/* }}} */
++
++/* {{{ dio_stream_set_option
++ * Set the stream options.
++ */
++static int dio_stream_set_option(php_stream *stream, int option, int value, void *ptrparam TSRMLS_DC)
++{
++      php_dio_stream_data *abstract = (php_dio_stream_data*)stream->abstract;
++
++      switch (option) {
++              case PHP_STREAM_OPTION_META_DATA_API:
++#ifdef DIO_NONBLOCK
++                      add_assoc_bool((zval *)ptrparam, "timed_out", abstract->timed_out);
++                      add_assoc_bool((zval *)ptrparam, "blocked", abstract->is_blocking);
++#endif
++                      add_assoc_bool((zval *)ptrparam, "eof", stream->eof);
++                      return PHP_STREAM_OPTION_RETURN_OK;
++
++#if PHP_MAJOR_VERSION >= 5
++              case PHP_STREAM_OPTION_CHECK_LIVENESS:
++                      stream->eof = abstract->end_of_file;
++                      return PHP_STREAM_OPTION_RETURN_OK;
++#endif /* PHP_MAJOR_VERSION >= 5 */
++
++              default:
++                      break;
++      }
++
++      return dio_common_set_option(abstract, option, value, ptrparam);
++}
++/* }}} */
++
++php_stream_ops dio_raw_stream_ops = {
++      dio_stream_write,
++      dio_stream_read,
++      dio_stream_close,
++      dio_stream_flush,
++      "dio",
++      NULL, /* seek */
++      NULL, /* cast */
++      NULL, /* stat */
++      dio_stream_set_option,
++};
++
++/* {{{ dio_raw_fopen_wrapper
++ * fopen for the dio.raw stream.
++ */
++static php_stream *dio_raw_fopen_wrapper(php_stream_wrapper *wrapper,
++                                         char *path, char *mode,
++                                         int options, char **opened_path,
++                                         php_stream_context *context STREAMS_DC TSRMLS_DC) {
++      php_dio_stream_data *data;
++      php_stream *stream;
++      char *filename;
++
++      /* Check it was actually for us (not a corrupted function pointer
++         somewhere!). */
++      if (strncmp(path, DIO_RAW_STREAM_PROTOCOL, sizeof(DIO_RAW_STREAM_PROTOCOL) - 1)) {
++              return NULL;
++      }
++
++      /* Get the actually file system name/path. */
++      filename = path + sizeof(DIO_RAW_STREAM_PROTOCOL) - 1;
++
++      /* Check we can actually access it. */
++      if (php_check_open_basedir(filename TSRMLS_CC) ||
++              (PG(safe_mode) && !php_checkuid(filename, mode, CHECKUID_CHECK_MODE_PARAM))) {
++              return NULL;
++      }
++
++      data = dio_create_stream_data();
++      data->stream_type = DIO_STREAM_TYPE_RAW;
++
++      /* Parse the context. */
++      if (context) {
++              dio_stream_context_get_basic_options(context, data TSRMLS_CC);
++      }
++
++      /* Try and open a raw stream. */
++      if (!dio_raw_open_stream(filename, mode, data TSRMLS_CC)) {
++              return NULL;
++      }
++
++      /* Create a PHP stream based on raw stream */
++      stream = php_stream_alloc(&dio_raw_stream_ops, data, 0, mode);
++      if (!stream) {
++              (void) dio_common_close(data);
++              efree(data);
++      }
++
++      return stream;
++}
++/* }}} */
++
++static php_stream_wrapper_ops dio_raw_stream_wops = {
++      dio_raw_fopen_wrapper,
++      NULL, /* stream_close */
++      NULL, /* stat */
++      NULL, /* stat_url */
++      NULL, /* opendir */
++      DIO_RAW_STREAM_NAME
++};
++
++php_stream_wrapper php_dio_raw_stream_wrapper = {
++      &dio_raw_stream_wops,
++      NULL,
++      0
++};
++
++/* {{{ proto dio_raw(string filename, string mode[, array options])
++ * Opens a raw direct IO stream.
++ */
++PHP_FUNCTION(dio_raw) {
++      zval *options = NULL;
++      php_dio_stream_data *data;
++      php_stream *stream;
++
++      char *filename;
++      int   filename_len;
++      char *mode;
++      int   mode_len;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|z", &filename, &filename_len, &mode, &mode_len, &options) == FAILURE) {
++              RETURN_FALSE;
++      }
++
++      /* Check the third argument is an array. */
++      if (options && (Z_TYPE_P(options) != IS_ARRAY)) {
++              RETURN_FALSE;
++      }
++
++      /* Check we can actually access the file. */
++      if (php_check_open_basedir(filename TSRMLS_CC) ||
++              (PG(safe_mode) && !php_checkuid(filename, mode, CHECKUID_CHECK_MODE_PARAM))) {
++              RETURN_FALSE;
++      }
++
++      data = dio_create_stream_data();
++      data->stream_type = DIO_STREAM_TYPE_RAW;
++
++      if (options) {
++              dio_assoc_array_get_basic_options(options, data TSRMLS_CC);
++      }
++
++      /* Try and open a raw stream. */
++      if (dio_raw_open_stream(filename, mode, data TSRMLS_CC)) {
++              stream = php_stream_alloc(&dio_raw_stream_ops, data, 0, mode);
++              if (!stream) {
++                      (void) dio_common_close(data);
++                      efree(data);
++                      RETURN_FALSE;
++              }
++      }
++
++      php_stream_to_zval(stream, return_value);
++}
++/* }}} */
++
++/*
++   +----------------------------------------------------------------------+
++   | Serial stream handling                                               |
++   +----------------------------------------------------------------------+
++*/
++
++/* {{{ dio_stream_flush
++ * Flush the stream.  If the stream is read only, it flushes the read
++ * stream, if it is write only it flushes the write, otherwise it flushes
++ * both.
++ */
++static int dio_serial_stream_flush(php_stream *stream TSRMLS_DC)
++{
++      return dio_serial_purge((php_dio_stream_data*)stream->abstract);
++}
++/* }}} */
++
++/* {{{ dio_stream_close
++ * Close the stream.  Restores the serial settings to their value before
++ * the stream was open.
++ */
++static int dio_serial_stream_close(php_stream *stream, int close_handle TSRMLS_DC)
++{
++      php_dio_stream_data *abstract = (php_dio_stream_data*)stream->abstract;
++
++      if (!dio_serial_uninit(abstract)) {
++              return 0;
++      }
++
++      if (!dio_common_close(abstract)) {
++              return 0;
++      }
++
++      efree(abstract);
++      return 1;
++}
++/* }}} */
++
++php_stream_ops dio_serial_stream_ops = {
++      dio_stream_write,
++      dio_stream_read,
++      dio_serial_stream_close,
++      dio_serial_stream_flush,
++      "dio",
++      NULL, /* seek */
++      NULL, /* cast */
++      NULL, /* stat */
++      dio_stream_set_option,
++};
++
++/* {{{ dio_raw_fopen_wrapper
++ * fopen for the dio.raw stream.
++ */
++static php_stream *dio_serial_fopen_wrapper(php_stream_wrapper *wrapper,
++                                         char *path, char *mode,
++                                         int options, char **opened_path,
++                                         php_stream_context *context STREAMS_DC TSRMLS_DC) {
++      php_dio_stream_data *data;
++      php_stream *stream;
++      char *filename;
++
++      /* Check it was actually for us (not a corrupted function pointer
++         somewhere!). */
++      if (strncmp(path, DIO_SERIAL_STREAM_PROTOCOL, sizeof(DIO_SERIAL_STREAM_PROTOCOL) - 1)) {
++              return NULL;
++      }
++
++      /* Get the actually file system name/path. */
++      filename = path + sizeof(DIO_SERIAL_STREAM_PROTOCOL) - 1;
++
++      /* Check we can actually access it. */
++      if (php_check_open_basedir(filename TSRMLS_CC) ||
++              (PG(safe_mode) && !php_checkuid(filename, mode, CHECKUID_CHECK_MODE_PARAM))) {
++              return NULL;
++      }
++
++      data = dio_create_stream_data();
++      data->stream_type = DIO_STREAM_TYPE_SERIAL;
++
++      /* Parse the context. */
++      if (context) {
++              dio_stream_context_get_basic_options(context, data TSRMLS_CC);
++              dio_stream_context_get_serial_options(context, data TSRMLS_CC);
++      }
++
++      /* Try and open a serial stream. */
++      if (!dio_serial_open_stream(filename, mode, data TSRMLS_CC)) {
++              return NULL;
++      }
++
++      stream = php_stream_alloc(&dio_serial_stream_ops, data, 0, mode);
++      if (!stream) {
++              efree(data);
++      }
++
++      return stream;
++}
++/* }}} */
++
++static php_stream_wrapper_ops dio_serial_stream_wops = {
++      dio_serial_fopen_wrapper,
++      NULL, /* stream_close */
++      NULL, /* stat */
++      NULL, /* stat_url */
++      NULL, /* opendir */
++      DIO_SERIAL_STREAM_NAME
++};
++
++php_stream_wrapper php_dio_serial_stream_wrapper = {
++      &dio_serial_stream_wops,
++      NULL,
++      0
++};
++
++/* {{{ proto dio_serial(string filename, string mode[, array options])
++ * Opens a serial direct IO stream.
++ */
++PHP_FUNCTION(dio_serial) {
++      zval *options = NULL;
++      php_dio_stream_data *data;
++      php_stream *stream;
++
++      char *filename;
++      int   filename_len;
++      char *mode;
++      int   mode_len;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|z", &filename, &filename_len, &mode, &mode_len, &options) == FAILURE) {
++              RETURN_FALSE;
++      }
++
++      /* Check the third argument is an array. */
++      if (options && (Z_TYPE_P(options) != IS_ARRAY)) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING,"dio_serial, the third argument should be an array of options");
++              RETURN_FALSE;
++      }
++
++      /* Check we can actually access the file. */
++      if (php_check_open_basedir(filename TSRMLS_CC) ||
++              (PG(safe_mode) && !php_checkuid(filename, mode, CHECKUID_CHECK_MODE_PARAM))) {
++              RETURN_FALSE;
++      }
++
++      data = dio_create_stream_data();
++      data->stream_type = DIO_STREAM_TYPE_SERIAL;
++
++      if (options) {
++              dio_assoc_array_get_basic_options(options, data TSRMLS_CC);
++              dio_assoc_array_get_serial_options(options, data TSRMLS_CC);
++      }
++
++      /* Try and open a serial stream. */
++      if (dio_serial_open_stream(filename, mode, data TSRMLS_CC)) {
++              stream = php_stream_alloc(&dio_serial_stream_ops, data, 0, mode);
++              if (!stream) {
++                      efree(data);
++                      RETURN_FALSE;
++              }
++      }
++
++      php_stream_to_zval(stream, return_value);
++}
++/* }}} */
++
++/*
++ * Local variables:
++ * c-basic-offset: 4
++ * tab-width: 4
++ * End:
++ * vim600: fdm=marker
++ * vim: sw=4 ts=4 noet
++ */
+--- /dev/null
++++ b/ext/dio/dio_win32.c
+@@ -0,0 +1,669 @@
++/*
++   +----------------------------------------------------------------------+
++   | PHP Version 5                                                        |
++   +----------------------------------------------------------------------+
++   | Copyright (c) 2009 Melanie Rhianna Lewis                             |
++   +----------------------------------------------------------------------+
++   | This source file is subject to version 3.0 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:           |
++   | http://www.php.net/license/3_0.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.               |
++   +----------------------------------------------------------------------+
++   | Author: Melanie Rhianna Lewis <cyberspice@php.net>                   |
++   +----------------------------------------------------------------------+
++ */
++
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#include "php.h"
++
++#include "php_dio_common.h"
++
++/* {{{ dio_data_rate_to_define
++ * Converts a numeric data rate to a termios define
++ */
++static int dio_data_rate_to_define(long rate, DWORD *def) {
++      switch (rate) {
++              case 75:
++              case 110:
++              case 134:
++              case 150:
++              case 300:
++              case 600:
++              case 1200:
++              case 1800:
++              case 2400:
++              case 4800:
++              case 7200:
++              case 9600:
++              case 14400:
++              case 19200:
++              case 38400:
++              case 57600:
++              case 115200:
++              case 56000:
++              case 128000:
++                      break;
++              default:
++                      return 0;
++      }
++
++      *def = (DWORD)rate;
++      return 1;
++}
++/* }}} */
++
++
++/* {{{ dio_data_bits_to_define
++ * Converts a number of data bits to a termios define
++ */
++static int dio_data_bits_to_define(int data_bits, DWORD *def) {
++      switch (data_bits) {
++              case 8:
++              case 7:
++              case 6:
++              case 5:
++              case 4:
++                      break;
++              default:
++                      return 0;
++      }
++
++      *def = (DWORD)data_bits;
++      return 1;
++}
++/* }}} */
++
++/* {{{ dio_stop_bits_to_define
++ * Converts a number of stop bits to a termios define
++ */
++static int dio_stop_bits_to_define(int stop_bits, DWORD *def) {
++      DWORD val;
++
++      switch (stop_bits) {
++              case 1:
++                      val = 0;
++                      break;
++              case 2:
++                      val = 2;
++                      break;
++              case 3:
++                      val = 1;
++                      break;
++              default:
++                      return 0;
++      }
++
++      *def = val;
++      return 1;
++}
++/* }}} */
++
++/* {{{ dio_parity_to_define
++ * Converts a parity type to a termios define
++ */
++static int dio_parity_to_define(int parity, DWORD *def) {
++      switch (parity) {
++              case 0:
++              case 1:
++              case 2:
++                      break;
++              default:
++                      return 0;
++      }
++
++      *def = (DWORD)parity;
++      return 1;
++}
++/* }}} */
++
++/* {{{ dio_create_stream_data
++ * Creates an initialised stream data structure.  Free with efree().
++ */
++php_dio_stream_data * dio_create_stream_data(void) {
++      php_dio_win32_stream_data * data = emalloc(sizeof(php_dio_win32_stream_data));
++      memset(data, 0, sizeof(php_dio_win32_stream_data));
++      dio_init_stream_data(&(data->common));
++      data->handle = INVALID_HANDLE_VALUE;
++      data->desired_access = 0;
++      data->creation_disposition = 0;
++      data->olddcb.DCBlength = sizeof(DCB);
++
++      return (php_dio_stream_data *)data;
++}
++/* }}} */
++
++/* {{{ dio_common_write
++ * Writes count chars from the buffer to the stream described by the stream data.
++ */
++size_t dio_common_write(php_dio_stream_data *data, const char *buf, size_t count) {
++      php_dio_win32_stream_data *wdata = (php_dio_win32_stream_data*)data;
++      DWORD total = 0;
++
++      if (WriteFile(wdata->handle, buf, (DWORD)count, &total, NULL)) {
++              return (size_t)total;
++      }
++
++      return 0;
++}
++/* }}} */
++
++/* {{{ dio_buffer_read
++ * Reads any available chars from the canonical buffer.
++ */
++static size_t dio_buffer_read(php_dio_win32_stream_data *wdata, const char *buf, size_t count) {
++      php_dio_win32_canon_data *canon_data = wdata->canon_data;
++      size_t total = 0;
++
++      /* Read always follows write.  I.e. if read ptr > write ptr buffer has
++         wrapped and so we need to copy two blocks of data. */
++      if (canon_data->read_pos > canon_data->write_pos) {
++
++              /* Check we actually need to copy both blocks */
++              if ((canon_data->size - canon_data->read_pos) > count) {
++
++                      /* No we don't.  Just copy as much as we were asked for. */
++                      memcpy((char*)buf, 
++                                 &(canon_data->buf[canon_data->read_pos]), 
++                                 count);
++                      /* Update the read pointer. */
++                      canon_data->read_pos += count;
++
++                      /* Return the amount read. */
++                      return count;
++              } else {
++
++                      /* We need to copy both blocks so copy data up to the end of 
++                         the buffer. */
++                      total = canon_data->size - canon_data->read_pos;
++                      memcpy((char*)buf, 
++                                 &(canon_data->buf[canon_data->read_pos]), 
++                                 total);
++                      canon_data->read_pos = 0;
++                      count -= total;
++
++                      /* Now copy the data from the start of the buffer either up
++                         count or the number of bytes in the buffer. */
++
++                      if (canon_data->write_pos > count) {
++                              memcpy((char*)buf, canon_data->buf, count);
++                              canon_data->read_pos = count;
++                              total += count;
++
++                              return total;
++                      } else {
++                              memcpy((char*)buf, canon_data->buf, canon_data->write_pos);
++                              canon_data->read_pos = canon_data->write_pos;
++                              total += canon_data->write_pos;
++
++                              return total;
++                      }
++              }
++
++      /* Else if write follows read.  This is a simpler case.  We just copy 
++         either all the data buffered or count, which ever is smaller. */
++      } else if (canon_data->write_pos > canon_data->read_pos) {
++              if ((canon_data->write_pos - canon_data->read_pos) > count) {
++                      memcpy((char*)buf, 
++                                 &(canon_data->buf[canon_data->read_pos]), 
++                                 count);
++                      canon_data->read_pos += count;
++
++                      return count;
++              } else {
++                      total = canon_data->write_pos - canon_data->read_pos;
++                      memcpy((char*)buf, 
++                                 &(canon_data->buf[canon_data->read_pos]), 
++                                 total);
++                      canon_data->read_pos += total;
++
++                      return total;
++              }
++      }
++
++      /* Else we need to read more data from the data port. */
++      return 0;
++}
++
++/* {{{ dio_com_read
++ * Read chars from the data port.
++ */
++static size_t dio_com_read(php_dio_stream_data *data, const char *buf, size_t count) {
++      php_dio_win32_stream_data *wdata = (php_dio_win32_stream_data*)data;
++      DWORD err, total = 0;
++
++      if (ReadFile(wdata->handle, (void*)buf, (DWORD)count, &total, NULL)) {
++
++              if (total) {
++                      return (size_t)total;
++              }
++
++              data->end_of_file = 1;
++      }
++
++      if (!data->end_of_file) {
++              err = GetLastError();
++
++              if (ERROR_HANDLE_EOF == err) {
++                      data->end_of_file = 1;
++              }
++      }
++
++      return 0;
++}
++
++/* {{{ dio_canonical_read
++ * Reads chars from the input stream until the internal buffer is full or a new
++ * line is reached.
++ */
++static size_t dio_canonical_read(php_dio_win32_stream_data *wdata, const char *buf, size_t count) {
++      php_dio_win32_canon_data *canon_data = wdata->canon_data;
++      size_t total = 0;
++      char ch;
++
++      /* See if there's any buffered data and copy it. */
++      total = dio_buffer_read(wdata, buf, count);
++      if (total) {
++              return total;
++      }
++
++      /* Need to read more data from the data port.  Buffer should be empty(er)
++         by now. */
++      do {
++              /* Is the buffer full? */
++              if (((canon_data->write_pos + 1) % canon_data->size) == 
++                      canon_data->read_pos) {
++                      break;
++              }
++
++              /* Read a byte from the input checking for EOF. */
++              if (!dio_com_read((php_dio_stream_data*)wdata, &ch, 1)) {
++                      break;
++              }
++
++              /* Translate CR to newlines (same as ICRNL in POSIX) */
++              ch = (ch != '\r') ? ch : '\n';
++
++              /* We read a character!  So buffer it. */
++              canon_data->buf[canon_data->write_pos++] = ch;
++              if (canon_data->write_pos >= canon_data->size) {
++                      canon_data->write_pos = 0;
++              }
++
++              /* End of line/input (^D)? */
++      } while ((ch != '\n') && (ch != 0x04));
++
++      return dio_buffer_read(wdata, buf, count);
++}
++/* }}} */
++
++/* {{{ dio_common_read
++ * Reads count chars to the buffer to the stream described by the stream data.
++ */
++size_t dio_common_read(php_dio_stream_data *data, const char *buf, size_t count) {
++
++      /* You ask for no bytes you'll get none :-) */
++      if (!count) {
++              return 0;
++      }
++
++      if (data->canonical) {
++              return dio_canonical_read((php_dio_win32_stream_data*)data, buf, count);
++      } else {
++              return dio_com_read(data, buf, count);
++      }
++}
++/* }}} */
++
++/* {{{ php_dio_stream_data
++ * Closes the php_stream.
++ */
++int dio_common_close(php_dio_stream_data *data) {
++      php_dio_win32_stream_data *wdata = (php_dio_win32_stream_data*)data;
++
++      if (data->canonical) {
++              efree(wdata->canon_data);
++      }
++
++      if (!CloseHandle(wdata->handle)) {
++              return 0;
++      }
++
++      return 1;
++}
++/* }}} */
++
++/* {{{ dio_common_set_option
++ * Sets/gets stream options
++ */
++int dio_common_set_option(php_dio_stream_data *data, int option, int value, void *ptrparam) {
++      COMMTIMEOUTS cto = { 0, 0, 0, 0, 0 };
++      int old_is_blocking = 0;
++
++      /* Can't do timeouts or non blocking with raw windows streams :-( */
++      if (DIO_STREAM_TYPE_SERIAL == data->stream_type) {
++              switch (option) {
++                      case PHP_STREAM_OPTION_BLOCKING:
++                              old_is_blocking   = data->is_blocking;
++                              data->is_blocking = value ? 1 : 0;
++
++                              /* Only change values if we need to change them. */
++                              if (data->is_blocking != old_is_blocking) {
++                                      /* If we're not blocking but don't have a timeout
++                                         set to return immediately */
++                                      if (!data->is_blocking && !data->has_timeout) {
++                                              cto.ReadIntervalTimeout = MAXDWORD;
++                                      }
++
++                                      /* If we have a timeout ignore the blocking and set
++                                         the total time in which to read the data */
++                                      if (data->has_timeout) {
++                                              cto.ReadIntervalTimeout = MAXDWORD;
++                                              cto.ReadTotalTimeoutMultiplier  = MAXDWORD;
++                                              cto.ReadTotalTimeoutConstant = (data->timeout_usec / 1000) +
++                                                      (data->timeout_sec * 1000);
++                                      }
++
++                                      if (!SetCommTimeouts(((php_dio_win32_stream_data*)data)->handle, &cto)) {
++                                              return PHP_STREAM_OPTION_RETURN_ERR;
++                                      }
++                              }
++                              return old_is_blocking ? PHP_STREAM_OPTION_RETURN_OK : PHP_STREAM_OPTION_RETURN_ERR;
++
++                      case PHP_STREAM_OPTION_READ_TIMEOUT:
++                              if (ptrparam) {
++                                      /* struct timeval is supported with PHP_WIN32 defined. */
++                                      struct timeval *tv = (struct timeval*)ptrparam;
++
++                                      /* A timeout of zero seconds and zero microseconds disables
++                                         any existing timeout. */
++                                      if (tv->tv_sec || tv->tv_usec) {
++                                              data->timeout_sec = tv->tv_sec;
++                                              data->timeout_usec = tv->tv_usec;
++                                              data->has_timeout = -1;
++
++                                              cto.ReadIntervalTimeout = MAXDWORD;
++                                              cto.ReadTotalTimeoutMultiplier  = MAXDWORD;
++                                              cto.ReadTotalTimeoutConstant = (data->timeout_usec / 1000) +
++                                                      (data->timeout_sec * 1000);
++                                      } else {
++                                              data->timeout_sec = 0;
++                                              data->timeout_usec = 0;
++                                              data->has_timeout = 0;
++                                              data->timed_out = 0;
++
++                                              /* If we're not blocking but don't have a timeout
++                                                 set to return immediately */
++                                              if (!data->is_blocking) {
++                                                      cto.ReadIntervalTimeout = MAXDWORD;
++                                              }
++                                      }
++
++                                      if (!SetCommTimeouts(((php_dio_win32_stream_data*)data)->handle, &cto)) {
++                                              return PHP_STREAM_OPTION_RETURN_ERR;
++                                      } else {
++                                              return PHP_STREAM_OPTION_RETURN_OK;
++                                      }
++                              } else {
++                                      return PHP_STREAM_OPTION_RETURN_ERR;
++                              }
++
++                      default:
++                              break;
++              }
++      }
++
++      return 1;
++}
++/* }}} */
++
++/* {{{ dio_raw_open_stream
++ * Opens the underlying stream.
++ */
++int dio_raw_open_stream(char *filename, char *mode, php_dio_stream_data *data TSRMLS_DC) {
++      php_dio_win32_stream_data *wdata = (php_dio_win32_stream_data*)data;
++      DWORD err;
++
++      switch(*mode) {
++              case 'r':
++                      wdata->creation_disposition = OPEN_EXISTING;
++                      break;
++              case 'w':
++                      wdata->creation_disposition = TRUNCATE_EXISTING;
++                      break;
++              case 'a':
++                      wdata->creation_disposition = OPEN_ALWAYS;
++                      break;
++              case 'x':
++                      wdata->creation_disposition = CREATE_NEW;
++                      break;
++      }
++      mode ++;
++
++      if (*mode && (*mode != '+')) {
++              mode++;
++      }
++
++      if (*mode && (*mode == '+')) {
++              wdata->desired_access = GENERIC_READ | GENERIC_WRITE;
++      } else if (OPEN_EXISTING == wdata->creation_disposition) {
++              wdata->desired_access = GENERIC_READ;
++      } else {
++              wdata->desired_access = GENERIC_WRITE;
++      }
++
++      wdata->handle = CreateFile(filename, wdata->desired_access, 0,
++                      NULL, wdata->creation_disposition, FILE_ATTRIBUTE_NORMAL, NULL);
++      if (INVALID_HANDLE_VALUE == wdata->handle) {
++              err = GetLastError();
++              switch (err) {
++                      case ERROR_FILE_EXISTS:
++                              php_error_docref(NULL TSRMLS_CC, E_WARNING, "File exists!");
++                              return 0;
++
++                      case ERROR_FILE_NOT_FOUND:
++                              /* ERROR_FILE_NOT_FOUND with TRUNCATE_EXISTING means that
++                               * the file doesn't exist so now try to create it. */
++                              if (TRUNCATE_EXISTING == wdata->creation_disposition) {
++                                      wdata->handle = CreateFile(filename, wdata->desired_access, 0,
++                                                              NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
++                                      if (INVALID_HANDLE_VALUE == wdata->handle) {
++                                              err = GetLastError();
++                                              return 0;
++                                      }
++                              } else {
++                                      return 0;
++                              }
++                              break;
++
++                      default:
++                              return 0;
++              }
++      }
++
++      /* If canonical allocate the canonical buffer. */
++      if (data->canonical) {
++              wdata->canon_data = emalloc(sizeof(php_dio_win32_canon_data));
++              memset(wdata->canon_data, 0, sizeof(php_dio_win32_canon_data));
++              wdata->canon_data->size = DIO_WIN32_CANON_BUF_SIZE;
++      }
++
++      return 1;
++}
++/* }}} */
++
++/* {{{ dio_serial_init
++ * Initialises the serial port
++ */
++static int dio_serial_init(php_dio_stream_data *data TSRMLS_DC) {
++      php_dio_win32_stream_data *wdata = (php_dio_win32_stream_data*)data;
++      DWORD err, rate_def, data_bits_def, stop_bits_def, parity_def;
++      DCB dcb;
++
++      if (!dio_data_rate_to_define(data->data_rate, &rate_def)) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid data_rate value (%d) (%d)", data->data_rate, __LINE__);
++              return 0;
++      }
++
++      if (!dio_data_bits_to_define(data->data_bits, &data_bits_def)) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid data_bits value (%d)", data->data_bits);
++              return 0;
++      }
++
++      if (!dio_stop_bits_to_define(data->stop_bits, &stop_bits_def)) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid stop_bits value (%d)", data->stop_bits);
++              return 0;
++      }
++
++      if (!dio_parity_to_define(data->parity, &parity_def)) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid parity value (%d)", data->parity);
++              return 0;
++      }
++
++      if (!GetCommState(wdata->handle, &(wdata->olddcb))) {
++              err = GetLastError();
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "GetCommState() failed! (%d)", err);
++              return 0;
++      }
++
++      /* Init the DCB structure */
++      memset(&dcb, 0, sizeof(DCB));
++      dcb.DCBlength = sizeof(DCB);
++
++      /* Set the communication parameters */
++      dcb.fBinary  = 1;
++      dcb.BaudRate = rate_def;
++      dcb.ByteSize = (BYTE)data_bits_def;
++      dcb.StopBits = (BYTE)stop_bits_def;
++      dcb.Parity   = (BYTE)parity_def;
++
++      /* Set the control line parameters */
++      dcb.fDtrControl       = DTR_CONTROL_DISABLE;
++      dcb.fDsrSensitivity   = FALSE;
++      dcb.fOutxDsrFlow      = FALSE;
++      dcb.fTXContinueOnXoff = FALSE;
++      dcb.fOutX             = FALSE;
++      dcb.fInX              = FALSE;
++      dcb.fErrorChar        = FALSE;
++      dcb.fNull             = FALSE;
++      dcb.fAbortOnError     = FALSE;
++
++      /* Hardware flow control */
++      if (data->flow_control) {
++              dcb.fOutxCtsFlow = TRUE;
++              dcb.fRtsControl  = RTS_CONTROL_HANDSHAKE;
++      } else {
++              dcb.fOutxCtsFlow = FALSE;
++              dcb.fRtsControl  = RTS_CONTROL_DISABLE;
++      }
++
++      if (!SetCommState(wdata->handle, &dcb)) {
++              return 0;
++      }
++
++      return 1;
++}
++/* }}} */
++
++
++/* {{{ dio_serial_uninit
++ * Restores the serial settings back to their original state.
++ */
++int dio_serial_uninit(php_dio_stream_data *data) {
++      php_dio_win32_stream_data *wdata = (php_dio_win32_stream_data*)data;
++
++      if (!SetCommState(wdata->handle, &(wdata->olddcb))) {
++              return 0;
++      }
++
++      return 1;
++}
++/* }}} */
++
++/* {{{ dio_serial_flush
++ * Purges the serial buffers of data.
++ */
++int dio_serial_purge(php_dio_stream_data *data) {
++      php_dio_win32_stream_data *wdata = (php_dio_win32_stream_data*)data;
++      BOOL ret;
++
++      /* Purge the canonical buffer if required */
++      if (data->canonical && ((wdata->desired_access & GENERIC_READ) == GENERIC_READ)) {
++              wdata->canon_data->read_pos  = 0;
++              wdata->canon_data->write_pos = 0;
++      }
++
++      /* Purge the com port */
++      if ((wdata->desired_access & (GENERIC_READ|GENERIC_WRITE)) == (GENERIC_READ|GENERIC_WRITE)) {
++              ret = PurgeComm(wdata->handle, PURGE_RXCLEAR|PURGE_TXCLEAR);
++      } else if ((wdata->desired_access & GENERIC_WRITE) == GENERIC_WRITE) {
++              ret = PurgeComm(wdata->handle, PURGE_TXCLEAR);
++      } else if ((wdata->desired_access & GENERIC_READ) == GENERIC_READ) {
++              ret = PurgeComm(wdata->handle, PURGE_RXCLEAR);
++      }
++
++      return ret;
++}
++/* }}} */
++
++/* {{{ dio_serial_open_stream
++ * Opens the underlying stream.
++ */
++int dio_serial_open_stream(char *filename, char *mode, php_dio_stream_data *data TSRMLS_DC) {
++      php_dio_win32_stream_data *wdata = (php_dio_win32_stream_data*)data;
++      COMMTIMEOUTS cto = { 0, 0, 0, 0, 0 };
++      DWORD err;
++
++      if (!dio_raw_open_stream(filename, mode, data TSRMLS_CC)) {
++              return 0;
++      }
++
++      if (!GetCommTimeouts(wdata->handle, &(wdata->oldcto))) {
++              err = GetLastError();
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "SetCommTimeouts() failed! (%d) Not a comm port?", err);
++              CloseHandle(wdata->handle);
++              return 0;
++      }
++
++      /* If we're not blocking but don't have a timeout
++         set to return immediately */
++      if (!data->is_blocking && !data->has_timeout) {
++              cto.ReadIntervalTimeout = MAXDWORD;
++      }
++      
++      /* If we have a timeout ignore the blocking and set
++         the total time in which to read the data */
++      if (data->has_timeout) {
++              cto.ReadIntervalTimeout = MAXDWORD;
++              cto.ReadTotalTimeoutMultiplier  = MAXDWORD;
++              cto.ReadTotalTimeoutConstant = (data->timeout_usec / 1000) + 
++                      (data->timeout_sec * 1000);
++      }
++
++      if (!SetCommTimeouts(wdata->handle, &cto)) {
++              CloseHandle(wdata->handle);
++              return 0;
++      }
++
++      if (!dio_serial_init(data TSRMLS_CC)) {
++              CloseHandle(wdata->handle);
++              return 0;
++      }
++
++      return 1;
++}
++/* }}} */
++
++/*
++ * Local variables:
++ * c-basic-offset: 4
++ * tab-width: 4
++ * End:
++ * vim600: fdm=marker
++ * vim: sw=4 ts=4 noet
++ */
+--- /dev/null
++++ b/ext/dio/php_dio.h
+@@ -0,0 +1,60 @@
++/*
++   +----------------------------------------------------------------------+
++   | PHP Version 5                                                        |
++   +----------------------------------------------------------------------+
++   | Copyright (c) 1997-2004 The PHP Group                                |
++   +----------------------------------------------------------------------+
++   | This source file is subject to version 3.0 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:           |
++   | http://www.php.net/license/3_0.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.               |
++   +----------------------------------------------------------------------+
++ */
++
++#ifndef PHP_DIO_H
++#define PHP_DIO_H
++
++#include "php.h"
++#include "php_dio_common.h"
++#include "php_dio_stream_wrappers.h"
++
++extern zend_module_entry dio_module_entry;
++#define phpext_dio_ptr &dio_module_entry
++
++#define PHP_DIO_VERSION "0.0.4RC4"
++
++/* Standard module functions. */
++PHP_MINIT_FUNCTION(dio);
++PHP_MSHUTDOWN_FUNCTION(dio);
++PHP_RINIT_FUNCTION(dio);
++PHP_RSHUTDOWN_FUNCTION(dio);
++PHP_MINFO_FUNCTION(dio);
++
++/* Legacy functions. */
++PHP_FUNCTION(dio_open);
++PHP_FUNCTION(dio_truncate);
++PHP_FUNCTION(dio_stat);
++PHP_FUNCTION(dio_seek);
++PHP_FUNCTION(dio_read);
++PHP_FUNCTION(dio_write);
++PHP_FUNCTION(dio_fcntl);
++PHP_FUNCTION(dio_close);
++PHP_FUNCTION(dio_tcsetattr);
++
++typedef struct {
++      int fd;
++} php_fd_t;
++
++#endif
++
++
++/*
++ * Local variables:
++ * tab-width: 4
++ * c-basic-offset: 4
++ * indent-tabs-mode: t
++ * End:
++ */
+--- /dev/null
++++ b/ext/dio/php_dio_common.h
+@@ -0,0 +1,77 @@
++/*
++   +----------------------------------------------------------------------+
++   | PHP Version 5                                                        |
++   +----------------------------------------------------------------------+
++   | Copyright (c) 2009 Melanie Rhianna Lewis                             |
++   +----------------------------------------------------------------------+
++   | This source file is subject to version 3.0 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:           |
++   | http://www.php.net/license/3_0.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.               |
++   +----------------------------------------------------------------------+
++   | Author: Melanie Rhianna Lewis <cyberspice@php.net>                   |
++   +----------------------------------------------------------------------+
++ */
++
++#ifndef PHP_DIO_COMMON_H_
++#define PHP_DIO_COMMON_H_
++
++#ifdef PHP_WIN32
++#define PHP_DIO_API __declspec(dllexport)
++#else
++#define PHP_DIO_API
++#endif
++
++#ifdef PHP_WIN32
++#include "php_dio_win32.h"
++#else
++#include "php_dio_posix.h"
++#endif
++
++#define DIO_STREAM_TYPE_NONE   0
++#define DIO_STREAM_TYPE_RAW    1
++#define DIO_STREAM_TYPE_SERIAL 2
++
++long dio_convert_to_long(zval *val);
++
++php_dio_stream_data * dio_create_stream_data(void);
++
++void dio_init_stream_data(php_dio_stream_data *data);
++
++void dio_assoc_array_get_basic_options(zval *options, php_dio_stream_data *data TSRMLS_DC);
++
++void dio_assoc_array_get_serial_options(zval *options, php_dio_stream_data *data TSRMLS_DC);
++
++void dio_stream_context_get_basic_options(php_stream_context *context, php_dio_stream_data *data TSRMLS_DC);
++
++void dio_stream_context_get_serial_options(php_stream_context *context, php_dio_stream_data *data TSRMLS_DC);
++
++size_t dio_common_write(php_dio_stream_data *data, const char *buf, size_t count);
++
++size_t dio_common_read(php_dio_stream_data *data, const char *buf, size_t count);
++
++int dio_common_close(php_dio_stream_data *data);
++
++int dio_common_set_option(php_dio_stream_data *data, int option, int value, void *ptrparam);
++
++int dio_raw_open_stream(char *filename, char *mode, php_dio_stream_data *data TSRMLS_DC);
++
++int dio_serial_uninit(php_dio_stream_data *data);
++
++int dio_serial_purge(php_dio_stream_data *data);
++
++int dio_serial_open_stream(char *filename, char *mode, php_dio_stream_data *data TSRMLS_DC);
++
++#endif /* PHP_DIO_COMMON_H_ */
++
++/*
++ * Local variables:
++ * c-basic-offset: 4
++ * tab-width: 4
++ * End:
++ * vim600: fdm=marker
++ * vim: sw=4 ts=4 noet
++ */
+--- /dev/null
++++ b/ext/dio/php_dio_common_data.h
+@@ -0,0 +1,59 @@
++/*
++   +----------------------------------------------------------------------+
++   | PHP Version 5                                                        |
++   +----------------------------------------------------------------------+
++   | Copyright (c) 2009 Melanie Rhianna Lewis                             |
++   +----------------------------------------------------------------------+
++   | This source file is subject to version 3.0 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:           |
++   | http://www.php.net/license/3_0.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.               |
++   +----------------------------------------------------------------------+
++   | Author: Melanie Rhianna Lewis <cyberspice@php.net>                   |
++   +----------------------------------------------------------------------+
++ */
++
++#ifndef PHP_DIO_COMMON_DATA_H_
++#define PHP_DIO_COMMON_DATA_H_
++
++/* This is the data structure 'base class'.  It is common data fields used
++ * by all versions of DIO.
++ */
++typedef struct _php_dio_stream_data {
++      /* Stream type */
++      int stream_type;
++      /* Stream options */
++      int end_of_file;
++#ifdef DIO_HAS_FILEPERMS
++      int has_perms;
++      int perms;
++#endif
++#ifdef DIO_NONBLOCK
++      int is_blocking;
++      int has_timeout;
++      long timeout_sec;
++      long timeout_usec;
++      int timed_out;
++#endif
++      /* Serial options */
++      long data_rate;
++      int data_bits;
++      int stop_bits;
++      int parity;
++      int flow_control;
++      int canonical;
++} php_dio_stream_data ;
++
++#endif /* PHP_DIO_COMMON_DATA_H_ */
++
++/*
++ * Local variables:
++ * c-basic-offset: 4
++ * tab-width: 4
++ * End:
++ * vim600: fdm=marker
++ * vim: sw=4 ts=4 noet
++ */
+--- /dev/null
++++ b/ext/dio/php_dio_posix.h
+@@ -0,0 +1,70 @@
++/*
++   +----------------------------------------------------------------------+
++   | PHP Version 5                                                        |
++   +----------------------------------------------------------------------+
++   | Copyright (c) 2009 Melanie Rhianna Lewis                             |
++   +----------------------------------------------------------------------+
++   | This source file is subject to version 3.0 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:           |
++   | http://www.php.net/license/3_0.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.               |
++   +----------------------------------------------------------------------+
++   | Author: Melanie Rhianna Lewis <cyberspice@php.net>                   |
++   +----------------------------------------------------------------------+
++ */
++
++#ifndef PHP_DIO_POSIX_H_
++#define PHP_DIO_POSIX_H_
++
++#include <sys/stat.h>
++#include <sys/types.h>
++#include <sys/select.h>
++#include <sys/time.h>
++
++#ifdef HAVE_UNISTD_H
++#include <unistd.h>
++#endif
++
++#include <fcntl.h>
++#include <termios.h>
++
++
++/**
++ * Detect if we can support non blocking IO.
++ */
++#ifdef O_NONBLOCK
++#define DIO_NONBLOCK O_NONBLOCK
++#else
++#ifdef O_NDELAY
++#define DIO_NONBLOCK O_NDELAY
++#endif
++#endif
++
++/**
++ * POSIXy platforms have file permissions
++ */
++#define DIO_HAS_FILEPERMS
++
++#include "php_dio_common_data.h"
++
++typedef struct _php_dio_posix_stream_data {
++      php_dio_stream_data common;
++      int fd;
++      int flags;
++      /* Serial options */
++      struct termios oldtio;
++} php_dio_posix_stream_data ;
++
++#endif /* PHP_DIO_POSIX_H_ */
++
++/*
++ * Local variables:
++ * c-basic-offset: 4
++ * tab-width: 4
++ * End:
++ * vim600: fdm=marker
++ * vim: sw=4 ts=4 noet
++ */
+--- /dev/null
++++ b/ext/dio/php_dio_stream_wrappers.h
+@@ -0,0 +1,44 @@
++/*
++   +----------------------------------------------------------------------+
++   | PHP Version 5                                                        |
++   +----------------------------------------------------------------------+
++   | Copyright (c) 2009 Melanie Rhianna Lewis                             |
++   +----------------------------------------------------------------------+
++   | This source file is subject to version 3.0 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:           |
++   | http://www.php.net/license/3_0.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.               |
++   +----------------------------------------------------------------------+
++   | Author: Melanie Rhianna Lewis <cyberspice@php.net>                   |
++   +----------------------------------------------------------------------+
++ */
++
++#ifndef PHP_DIO_STREAM_WRAPPERS_H_
++#define PHP_DIO_STREAM_WRAPPERS_H_
++
++#define DIO_RAW_STREAM_NAME         "dio.raw"
++#define DIO_RAW_STREAM_PROTOCOL     "dio.raw://"
++#define DIO_SERIAL_STREAM_NAME      "dio.serial"
++#define DIO_SERIAL_STREAM_PROTOCOL  "dio.serial://"
++
++extern php_stream_wrapper php_dio_raw_stream_wrapper;
++
++PHP_FUNCTION(dio_raw);
++
++extern php_stream_wrapper php_dio_serial_stream_wrapper;
++
++PHP_FUNCTION(dio_serial);
++
++#endif /* PHP_DIO_STREAM_WRAPPERS_H_ */
++
++/*
++ * Local variables:
++ * c-basic-offset: 4
++ * tab-width: 4
++ * End:
++ * vim600: fdm=marker
++ * vim: sw=4 ts=4 noet
++ */
+--- /dev/null
++++ b/ext/dio/php_dio_win32.h
+@@ -0,0 +1,62 @@
++/*
++   +----------------------------------------------------------------------+
++   | PHP Version 5                                                        |
++   +----------------------------------------------------------------------+
++   | Copyright (c) 2009 Melanie Rhianna Lewis                             |
++   +----------------------------------------------------------------------+
++   | This source file is subject to version 3.0 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:           |
++   | http://www.php.net/license/3_0.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.               |
++   +----------------------------------------------------------------------+
++   | Author: Melanie Rhianna Lewis <cyberspice@php.net>                   |
++   +----------------------------------------------------------------------+
++ */
++
++#ifndef PHP_DIO_WIN32_H_
++#define PHP_DIO_WIN32_H_
++
++#include <windows.h>
++
++/* Windows platform can do non blocking. */
++#define DIO_NONBLOCK
++
++#include "php_dio_common_data.h"
++
++#define DIO_WIN32_CANON_BUF_SIZE 8192
++
++/* This is the buffer information when reading in canonical mode.  Data is 
++   read right up to either buffer being full or a newline being read.  Excess
++   data will be retained in the buffer until the next read. */
++typedef struct _php_dio_win32_canon_data {
++      size_t size;
++      size_t read_pos;
++      size_t write_pos;
++      char buf[DIO_WIN32_CANON_BUF_SIZE];
++
++} php_dio_win32_canon_data;
++
++typedef struct _php_dio_win32_stream_data {
++      php_dio_stream_data common;
++      HANDLE handle;
++      DWORD desired_access;
++      DWORD creation_disposition;
++      DCB olddcb;
++      COMMTIMEOUTS oldcto;
++      php_dio_win32_canon_data *canon_data;
++
++} php_dio_win32_stream_data ;
++
++#endif /* PHP_DIO_WIN32_H_ */
++
++/*
++ * Local variables:
++ * c-basic-offset: 4
++ * tab-width: 4
++ * End:
++ * vim600: fdm=marker
++ * vim: sw=4 ts=4 noet
++ */
+--- /dev/null
++++ b/ext/dio/tests/001.phpt
+@@ -0,0 +1,23 @@
++--TEST--
++Test dio legacy open
++--SKIPIF--
++<?php if (!extension_loaded("dio")) print "skip"; ?>
++--FILE--
++<?php 
++      $iswin = (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN'); 
++
++      if (!$iswin) {
++              $filename = "/dev/null";
++      } else {
++              $filename = "NUL";
++      }
++      
++      $f = dio_open($filename,O_RDONLY);
++      if ($f) {
++              echo "Legacy open passed";
++      } else {
++              echo "Legacy open failed";
++      }
++?>
++--EXPECT--
++Legacy open passed
+--- /dev/null
++++ b/ext/dio/tests/dio_raw_stream_001.phpt
+@@ -0,0 +1,24 @@
++--TEST--
++Test dio raw stream open
++--SKIPIF--
++<?php if (!extension_loaded("dio")) print "skip"; ?>
++--FILE--
++<?php
++      $iswin = (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN'); 
++
++      if (!$iswin) {
++              $filename = "dio.raw:///dev/null";
++      } else {
++              $filename = "dio.raw://NUL";
++      }
++      
++      $f = fopen($filename, "r+");
++      if ($f) {
++              echo "Raw open passed";
++              fclose($f);
++      } else {
++              echo "Raw open failed";
++      }
++?>
++--EXPECT--
++Raw open passed
+--- /dev/null
++++ b/ext/dio/tests/dio_raw_stream_002.phpt
+@@ -0,0 +1,27 @@
++--TEST--
++Test dio raw stream close
++--SKIPIF--
++<?php if (!extension_loaded("dio")) print "skip"; ?>
++--FILE--
++<?php 
++      $iswin = (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN'); 
++
++      if (!$iswin) {
++              $filename = "dio.raw:///dev/null";
++      } else {
++              $filename = "dio.raw://NUL";
++      }
++
++      $f = fopen($filename, "r+");
++      if ($f) {
++              if (fclose($f)) {
++                      echo "Raw close passed";
++              } else {
++                      echo "Raw close failed";
++              }
++      } else {
++              echo "Raw open failed";
++      }
++?>
++--EXPECT--
++Raw close passed
+--- /dev/null
++++ b/ext/dio/tests/dio_raw_stream_003.phpt
+@@ -0,0 +1,29 @@
++--TEST--
++Test dio raw stream write
++--SKIPIF--
++<?php if (!extension_loaded("dio")) print "skip"; ?>
++--FILE--
++<?php 
++      $iswin = (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN'); 
++
++      if (!$iswin) {
++              $filename = "dio.raw:///dev/null";
++      } else {
++              $filename = "dio.raw://NUL";
++      }
++
++      $f = fopen($filename, "r+");
++      if ($f) {
++              $data = str_repeat("+", 2048);
++              if (fwrite($f, $data)) {
++                      echo "Raw write passed";
++              } else {
++                      echo "Raw write failed";
++              }
++              fclose($f);
++      } else {
++              echo "Raw open failed";
++      }
++?>
++--EXPECT--
++Raw write passed
+--- /dev/null
++++ b/ext/dio/tests/dio_raw_stream_004.phpt
+@@ -0,0 +1,46 @@
++--TEST--
++Test dio raw read
++--SKIPIF--
++<?php
++      if (!extension_loaded('dio')) print 'skip';
++?>
++--FILE--
++<?php 
++      // Create a temp file with some content to read
++
++      // Create the temp file name
++      if (!function_exists('sys_get_temp_dir')) {
++              if (!($tmpdir = getenv('TEMP'))) {
++                      $tmpdir = '';
++              }
++      } else {
++              $tmpdir = sys_get_temp_dir();
++      }
++      $filename = tempnam($tmpdir, 'dio_raw_stream_004.tmp');
++                      
++      // Create the temp file
++      $tf = fopen($filename, "w");
++      if ($tf) {
++              fwrite($tf, str_repeat('*', 2048));     
++              fclose($tf);
++      } else {
++              echo "Can\'t create temp file";
++      }
++
++      $f = fopen('dio.raw://' . $filename, "r");
++      if ($f) {
++              $data = fread($f, 2048);
++              if ($data && (strlen($data) == 2048)) {
++                      echo "Raw read passed";
++              } else {
++                      echo "Raw read failed";
++              }
++              fclose($f);
++      } else {
++              echo "Raw open failed";
++      }
++
++      unlink($filename);
++?>
++--EXPECT--
++Raw read passed
+--- /dev/null
++++ b/ext/dio/tests/dio_raw_stream_005.phpt
+@@ -0,0 +1,45 @@
++--TEST--
++Test dio eof read
++--SKIPIF--
++<?php
++      if (!extension_loaded('dio')) print 'skip';
++?>
++--FILE--
++<?php 
++      // Create a temp file with some content to read
++
++      // Create the temp file name
++      if (!function_exists('sys_get_temp_dir')) {
++              if (!($tmpdir = getenv('TEMP'))) {
++                      $tmpdir = '';
++              }
++      } else {
++              $tmpdir = sys_get_temp_dir();
++      }
++      $filename = tempnam($tmpdir, 'dio_raw_stream_005.tmp');
++                      
++      // Create the temp file
++      $tf = fopen($filename, "w");
++      if ($tf) {
++              fclose($tf);
++      } else {
++              echo "Can\'t create temp file";
++      }
++
++      $f = fopen('dio.raw://' . $filename, "r");
++      if ($f) {
++              $data = fread($f, 2048);
++              if (feof($f)) {
++                      echo "Raw feof passed";
++              } else {
++                      echo "Raw feof failed";
++              }
++              fclose($f);
++      } else {
++              echo "Raw open failed";
++      }
++
++      unlink($filename);
++?>
++--EXPECT--
++Raw feof passed
+--- /dev/null
++++ b/ext/dio/tests/dio_raw_stream_006.phpt
+@@ -0,0 +1,46 @@
++--TEST--
++Test dio raw read
++--SKIPIF--
++<?php
++      if (!extension_loaded('dio')) print 'skip';
++?>
++--FILE--
++<?php 
++      // Create a temp file with some content to read
++
++      // Create the temp file name
++      if (!function_exists('sys_get_temp_dir')) {
++              if (!($tmpdir = getenv('TEMP'))) {
++                      $tmpdir = '';
++              }
++      } else {
++              $tmpdir = sys_get_temp_dir();
++      }
++      $filename = tempnam($tmpdir, 'diotest');
++                      
++      // Create the temp file
++      $tf = fopen($filename, "w");
++      if ($tf) {
++              fwrite($tf, str_repeat('*', 2048));     
++              fclose($tf);
++      } else {
++              echo "Can\'t create temp file";
++      }
++
++      $f = fopen('dio.raw://' . $filename, "r");
++      if ($f) {
++              $data = fread($f, 1024);
++              if (stream_set_blocking($f, false)) {
++                      echo "Raw set blocking passed";
++              } else {
++                      echo "Raw set blocking failed";
++              }
++              fclose($f);
++      } else {
++              echo "Raw open failed";
++      }
++
++      unlink($filename);
++?>
++--EXPECT--
++Raw set blocking passed
+--- /dev/null
++++ b/ext/dio/tests/dio_raw_stream_007.phpt
+@@ -0,0 +1,22 @@
++--TEST--
++Test dio_raw() call
++--SKIPIF--
++<?php if (!extension_loaded("dio")) print "skip"; ?>
++--FILE--
++<?php
++      $iswin = (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN'); 
++
++      if (!$iswin) {
++              $filename = "/dev/null";
++      } else {
++              $filename = "NUL";
++      }
++
++      $f = dio_raw($filename, "r+");
++      if ($f) {
++              echo "dio_raw passed";
++              fclose($f);
++      }
++?>
++--EXPECT--
++dio_raw passed

diff --git a/lang/php5/patches/011-PECL-dio-additional-baudrates.patch b/lang/php5/patches/011-PECL-dio-additional-baudrates.patch
new file mode 100644 (file)
index 0000000..11a2981
--- /dev/null
+++ b/lang/php5/patches/011-PECL-dio-additional-baudrates.patch
@@ -0,0 +1,29 @@
+--- a/ext/dio/dio.c
++++ b/ext/dio/dio.c
+@@ -442,6 +442,26 @@ PHP_FUNCTION(dio_tcsetattr)
+ 
+       /* assign to correct values... */
+       switch (Baud_Rate)  {
++#ifdef B460800
++              case 460800:
++                      BAUD = B460800;
++                      break;
++#endif
++#ifdef B230400
++              case 230400:
++                      BAUD = B230400;
++                      break;
++#endif
++#ifdef B115200
++              case 115200:
++                      BAUD = B115200;
++                      break;
++#endif
++#ifdef B57600
++              case 57600:
++                      BAUD = B57600;
++                      break;
++#endif
+               case 38400:
+                       BAUD = B38400;
+                       break;

diff --git a/lang/php5/patches/900-prevent_buildconf_force.patch b/lang/php5/patches/900-prevent_buildconf_force.patch
index 52cb8fdc9fb1b1419a510ab1e68075640861bfb5..ec5cd09b666a994f04d3689c98ebaaf85aa2c454 100644 (file)
--- a/lang/php5/patches/900-prevent_buildconf_force.patch
+++ b/lang/php5/patches/900-prevent_buildconf_force.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -847,6 +847,30 @@
+@@ -847,6 +847,30 @@ ac_help="$ac_help
  ac_help="$ac_help
    --with-zlib-dir=<DIR>   Define the location of zlib install directory"
  ac_help="$ac_help
@@ -31,42 +31,51 @@
    --enable-bcmath         Enable bc style precision math functions"
  ac_help="$ac_help
    --with-bz2[=DIR]        Include BZip2 support"
-@@ -1888,12 +1912,12 @@
+@@ -884,6 +908,8 @@ ac_help="$ac_help
+ ac_help="$ac_help
+   --disable-flatfile        DBA: FlatFile support (bundled)"
+ ac_help="$ac_help
++  --enable-dio            Enable direct I/O support"
++ac_help="$ac_help
+   --disable-dom           Disable DOM support"
+ ac_help="$ac_help
+   --with-libxml-dir[=DIR]   DOM: libxml2 install prefix"
+@@ -1888,12 +1914,12 @@ fi
  
  
  echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
 -echo "configure:1892: checking for Cygwin environment" >&5
-+echo "configure:1916: checking for Cygwin environment" >&5
++echo "configure:1918: checking for Cygwin environment" >&5
  if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 1897 "configure"
-+#line 1921 "configure"
++#line 1923 "configure"
  #include "confdefs.h"
  
  int main() {
-@@ -1904,7 +1928,7 @@
+@@ -1904,7 +1930,7 @@ int main() {
  return __CYGWIN__;
  ; return 0; }
  EOF
 -if { (eval echo configure:1908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_cygwin=yes
  else
-@@ -1921,19 +1945,19 @@
+@@ -1921,19 +1947,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
  CYGWIN=
  test "$ac_cv_cygwin" = yes && CYGWIN=yes
  echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
 -echo "configure:1925: checking for mingw32 environment" >&5
-+echo "configure:1949: checking for mingw32 environment" >&5
++echo "configure:1951: checking for mingw32 environment" >&5
  if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 1930 "configure"
-+#line 1954 "configure"
++#line 1956 "configure"
  #include "confdefs.h"
  
  int main() {
@@ -74,357 +83,357 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:1937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_mingw32=yes
  else
-@@ -1952,7 +1976,7 @@
+@@ -1952,7 +1978,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes
  
  
  echo $ac_n "checking for egrep""... $ac_c" 1>&6
 -echo "configure:1956: checking for egrep" >&5
-+echo "configure:1980: checking for egrep" >&5
++echo "configure:1982: checking for egrep" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_egrep'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1967,7 +1991,7 @@
+@@ -1967,7 +1993,7 @@ echo "$ac_t""$ac_cv_prog_egrep" 1>&6
   
  
  echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6
 -echo "configure:1971: checking for a sed that does not truncate output" >&5
-+echo "configure:1995: checking for a sed that does not truncate output" >&5
++echo "configure:1997: checking for a sed that does not truncate output" >&5
  if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2117,7 +2141,7 @@
+@@ -2117,7 +2143,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
  fi
  
  echo $ac_n "checking host system type""... $ac_c" 1>&6
 -echo "configure:2121: checking host system type" >&5
-+echo "configure:2145: checking host system type" >&5
++echo "configure:2147: checking host system type" >&5
  
  host_alias=$host
  case "$host_alias" in
-@@ -2138,7 +2162,7 @@
+@@ -2138,7 +2164,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
  echo "$ac_t""$host" 1>&6
  
  echo $ac_n "checking target system type""... $ac_c" 1>&6
 -echo "configure:2142: checking target system type" >&5
-+echo "configure:2166: checking target system type" >&5
++echo "configure:2168: checking target system type" >&5
  
  target_alias=$target
  case "$target_alias" in
-@@ -2250,7 +2274,7 @@
+@@ -2250,7 +2276,7 @@ rm -f libs/*
  # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:2254: checking for $ac_word" >&5
-+echo "configure:2278: checking for $ac_word" >&5
++echo "configure:2280: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2280,7 +2304,7 @@
+@@ -2280,7 +2306,7 @@ if test -z "$CC"; then
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:2284: checking for $ac_word" >&5
-+echo "configure:2308: checking for $ac_word" >&5
++echo "configure:2310: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2331,7 +2355,7 @@
+@@ -2331,7 +2357,7 @@ fi
        # Extract the first word of "cl", so it can be a program name with args.
  set dummy cl; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:2335: checking for $ac_word" >&5
-+echo "configure:2359: checking for $ac_word" >&5
++echo "configure:2361: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2363,7 +2387,7 @@
+@@ -2363,7 +2389,7 @@ fi
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
 -echo "configure:2367: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:2391: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:2393: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -2374,12 +2398,12 @@
+@@ -2374,12 +2400,12 @@ cross_compiling=$ac_cv_prog_cc_cross
  
  cat > conftest.$ac_ext << EOF
  
 -#line 2378 "configure"
-+#line 2402 "configure"
++#line 2404 "configure"
  #include "confdefs.h"
  
  main(){return(0);}
  EOF
 -if { (eval echo configure:2383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
-@@ -2405,12 +2429,12 @@
+@@ -2405,12 +2431,12 @@ if test $ac_cv_prog_cc_works = no; then
    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
 -echo "configure:2409: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:2433: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:2435: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
 -echo "configure:2414: checking whether we are using GNU C" >&5
-+echo "configure:2438: checking whether we are using GNU C" >&5
++echo "configure:2440: checking whether we are using GNU C" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2419,7 +2443,7 @@
+@@ -2419,7 +2445,7 @@ else
    yes;
  #endif
  EOF
 -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2447: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2449: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
    ac_cv_prog_gcc=no
-@@ -2438,7 +2462,7 @@
+@@ -2438,7 +2464,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
  ac_save_CFLAGS="$CFLAGS"
  CFLAGS=
  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
 -echo "configure:2442: checking whether ${CC-cc} accepts -g" >&5
-+echo "configure:2466: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:2468: checking whether ${CC-cc} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2470,7 +2494,7 @@
+@@ -2470,7 +2496,7 @@ else
  fi
  
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
 -echo "configure:2474: checking how to run the C preprocessor" >&5
-+echo "configure:2498: checking how to run the C preprocessor" >&5
++echo "configure:2500: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
-@@ -2485,13 +2509,13 @@
+@@ -2485,13 +2511,13 @@ else
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
 -#line 2489 "configure"
-+#line 2513 "configure"
++#line 2515 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:2495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2519: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
-@@ -2502,13 +2526,13 @@
+@@ -2502,13 +2528,13 @@ else
    rm -rf conftest*
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
 -#line 2506 "configure"
-+#line 2530 "configure"
++#line 2532 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:2512: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2536: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
-@@ -2519,13 +2543,13 @@
+@@ -2519,13 +2545,13 @@ else
    rm -rf conftest*
    CPP="${CC-cc} -nologo -E"
    cat > conftest.$ac_ext <<EOF
 -#line 2523 "configure"
-+#line 2547 "configure"
++#line 2549 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:2529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2553: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
-@@ -2552,9 +2576,9 @@
+@@ -2552,9 +2578,9 @@ echo "$ac_t""$CPP" 1>&6
  
    ICC="no"
    echo $ac_n "checking for icc""... $ac_c" 1>&6
 -echo "configure:2556: checking for icc" >&5
-+echo "configure:2580: checking for icc" >&5
++echo "configure:2582: checking for icc" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 2558 "configure"
-+#line 2582 "configure"
++#line 2584 "configure"
  #include "confdefs.h"
  __INTEL_COMPILER
  EOF
-@@ -2576,9 +2600,9 @@
+@@ -2576,9 +2602,9 @@ rm -f conftest*
  
    SUNCC="no"
    echo $ac_n "checking for suncc""... $ac_c" 1>&6
 -echo "configure:2580: checking for suncc" >&5
-+echo "configure:2604: checking for suncc" >&5
++echo "configure:2606: checking for suncc" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 2582 "configure"
-+#line 2606 "configure"
++#line 2608 "configure"
  #include "confdefs.h"
  __SUNPRO_C
  EOF
-@@ -2601,10 +2625,10 @@
+@@ -2601,10 +2627,10 @@ rm -f conftest*
  
  if test "x$CC" != xcc; then
    echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6
 -echo "configure:2605: checking whether $CC and cc understand -c and -o together" >&5
-+echo "configure:2629: checking whether $CC and cc understand -c and -o together" >&5
++echo "configure:2631: checking whether $CC and cc understand -c and -o together" >&5
  else
    echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6
 -echo "configure:2608: checking whether cc understands -c and -o together" >&5
-+echo "configure:2632: checking whether cc understands -c and -o together" >&5
++echo "configure:2634: checking whether cc understands -c and -o together" >&5
  fi
  set dummy $CC; ac_cc="`echo $2 |
                       sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
-@@ -2616,16 +2640,16 @@
+@@ -2616,16 +2642,16 @@ else
  # We do the test twice because some compilers refuse to overwrite an
  # existing .o file with -o, though they will create one.
  ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5'
 -if { (eval echo configure:2620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
 -   test -f conftest.o && { (eval echo configure:2621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
-+if { (eval echo configure:2644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-+   test -f conftest.o && { (eval echo configure:2645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
++if { (eval echo configure:2646: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
++   test -f conftest.o && { (eval echo configure:2647: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
  then
    eval ac_cv_prog_cc_${ac_cc}_c_o=yes
    if test "x$CC" != xcc; then
      # Test first that cc exists at all.
 -    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
-+    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2650: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
++    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
        ac_try='cc -c conftest.c -o conftest.o 1>&5'
 -      if { (eval echo configure:2628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
 -       test -f conftest.o && { (eval echo configure:2629: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
-+      if { (eval echo configure:2652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-+       test -f conftest.o && { (eval echo configure:2653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
++      if { (eval echo configure:2654: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
++       test -f conftest.o && { (eval echo configure:2655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
        then
          # cc works too.
          :
-@@ -2652,7 +2676,7 @@
+@@ -2652,7 +2678,7 @@ EOF
  fi
  
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
 -echo "configure:2656: checking how to run the C preprocessor" >&5
-+echo "configure:2680: checking how to run the C preprocessor" >&5
++echo "configure:2682: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
-@@ -2667,13 +2691,13 @@
+@@ -2667,13 +2693,13 @@ else
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
 -#line 2671 "configure"
-+#line 2695 "configure"
++#line 2697 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:2677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2701: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2703: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
-@@ -2684,13 +2708,13 @@
+@@ -2684,13 +2710,13 @@ else
    rm -rf conftest*
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
 -#line 2688 "configure"
-+#line 2712 "configure"
++#line 2714 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:2694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
-@@ -2701,13 +2725,13 @@
+@@ -2701,13 +2727,13 @@ else
    rm -rf conftest*
    CPP="${CC-cc} -nologo -E"
    cat > conftest.$ac_ext <<EOF
 -#line 2705 "configure"
-+#line 2729 "configure"
++#line 2731 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:2711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:2735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2737: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
-@@ -2732,9 +2756,9 @@
+@@ -2732,9 +2758,9 @@ fi
  echo "$ac_t""$CPP" 1>&6
  
  echo $ac_n "checking for AIX""... $ac_c" 1>&6
 -echo "configure:2736: checking for AIX" >&5
-+echo "configure:2760: checking for AIX" >&5
++echo "configure:2762: checking for AIX" >&5
  cat > conftest.$ac_ext <<EOF
 -#line 2738 "configure"
-+#line 2762 "configure"
++#line 2764 "configure"
  #include "confdefs.h"
  #ifdef _AIX
    yes
-@@ -2756,7 +2780,7 @@
+@@ -2756,7 +2782,7 @@ rm -f conftest*
  
  
  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
 -echo "configure:2760: checking whether ln -s works" >&5
-+echo "configure:2784: checking whether ln -s works" >&5
++echo "configure:2786: checking whether ln -s works" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2781,7 +2805,7 @@
+@@ -2781,7 +2807,7 @@ fi
  php_with_libdir=lib
  
  echo $ac_n "checking for system library directory""... $ac_c" 1>&6
 -echo "configure:2785: checking for system library directory" >&5
-+echo "configure:2809: checking for system library directory" >&5
++echo "configure:2811: checking for system library directory" >&5
  # Check whether --with-libdir or --without-libdir was given.
  if test "${with_libdir+set}" = set; then
    withval="$with_libdir"
-@@ -2804,7 +2828,7 @@
+@@ -2804,7 +2830,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_enable_rpath=yes
  
  echo $ac_n "checking whether to enable runpaths""... $ac_c" 1>&6
 -echo "configure:2808: checking whether to enable runpaths" >&5
-+echo "configure:2832: checking whether to enable runpaths" >&5
++echo "configure:2834: checking whether to enable runpaths" >&5
  # Check whether --enable-rpath or --disable-rpath was given.
  if test "${enable_rpath+set}" = set; then
    enableval="$enable_rpath"
-@@ -2825,7 +2849,7 @@
+@@ -2825,7 +2851,7 @@ echo "$ac_t""$ext_output" 1>&6
  
  
  echo $ac_n "checking if compiler supports -R""... $ac_c" 1>&6
 -echo "configure:2829: checking if compiler supports -R" >&5
-+echo "configure:2853: checking if compiler supports -R" >&5
++echo "configure:2855: checking if compiler supports -R" >&5
  if eval "test \"`echo '$''{'php_cv_cc_dashr'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2833,14 +2857,14 @@
+@@ -2833,14 +2859,14 @@ else
    SAVE_LIBS=$LIBS
    LIBS="-R /usr/$PHP_LIBDIR $LIBS"
    cat > conftest.$ac_ext <<EOF
 -#line 2837 "configure"
-+#line 2861 "configure"
++#line 2863 "configure"
  #include "confdefs.h"
  
  int main() {
@@ -432,25 +441,25 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:2844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    php_cv_cc_dashr=yes
  else
-@@ -2858,7 +2882,7 @@
+@@ -2858,7 +2884,7 @@ if test $php_cv_cc_dashr = "yes"; then
    ld_runpath_switch=-R
  else
    echo $ac_n "checking if compiler supports -Wl,-rpath,""... $ac_c" 1>&6
 -echo "configure:2862: checking if compiler supports -Wl,-rpath," >&5
-+echo "configure:2886: checking if compiler supports -Wl,-rpath," >&5
++echo "configure:2888: checking if compiler supports -Wl,-rpath," >&5
    if eval "test \"`echo '$''{'php_cv_cc_rpath'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2866,14 +2890,14 @@
+@@ -2866,14 +2892,14 @@ else
      SAVE_LIBS=$LIBS
      LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS"
      cat > conftest.$ac_ext <<EOF
 -#line 2870 "configure"
-+#line 2894 "configure"
++#line 2896 "configure"
  #include "confdefs.h"
  
  int main() {
@@ -458,253 +467,253 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:2877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    php_cv_cc_rpath=yes
  else
-@@ -2904,7 +2928,7 @@
+@@ -2904,7 +2930,7 @@ do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:2908: checking for $ac_word" >&5
-+echo "configure:2932: checking for $ac_word" >&5
++echo "configure:2934: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2945,7 +2969,7 @@
+@@ -2945,7 +2971,7 @@ test -n "$AWK" || AWK="bork"
        ;;
      *)
        echo $ac_n "checking if $AWK is broken""... $ac_c" 1>&6
 -echo "configure:2949: checking if $AWK is broken" >&5
-+echo "configure:2973: checking if $AWK is broken" >&5
++echo "configure:2975: checking if $AWK is broken" >&5
        if ! $AWK 'function foo() {}' >/dev/null 2>&1 ; then
          echo "$ac_t""yes" 1>&6
          { echo "configure: error: You should install GNU awk" 1>&2; exit 1; }
-@@ -2964,7 +2988,7 @@
+@@ -2964,7 +2990,7 @@ do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:2968: checking for $ac_word" >&5
-+echo "configure:2992: checking for $ac_word" >&5
++echo "configure:2994: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -3004,7 +3028,7 @@
+@@ -3004,7 +3030,7 @@ test -n "$YACC" || YACC="yacc"
    bison_version=none
    if test "$YACC"; then
      echo $ac_n "checking for bison version""... $ac_c" 1>&6
 -echo "configure:3008: checking for bison version" >&5
-+echo "configure:3032: checking for bison version" >&5
++echo "configure:3034: checking for bison version" >&5
  if eval "test \"`echo '$''{'php_cv_bison_version'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -3042,7 +3066,7 @@
+@@ -3042,7 +3068,7 @@ echo "$ac_t""$php_cv_bison_version" 1>&6
    # Extract the first word of "re2c", so it can be a program name with args.
  set dummy re2c; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:3046: checking for $ac_word" >&5
-+echo "configure:3070: checking for $ac_word" >&5
++echo "configure:3072: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RE2C'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -3070,7 +3094,7 @@
+@@ -3070,7 +3096,7 @@ fi
  
    if test -n "$RE2C"; then
      echo $ac_n "checking for re2c version""... $ac_c" 1>&6
 -echo "configure:3074: checking for re2c version" >&5
-+echo "configure:3098: checking for re2c version" >&5
++echo "configure:3100: checking for re2c version" >&5
  if eval "test \"`echo '$''{'php_cv_re2c_version'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -3109,7 +3133,7 @@
+@@ -3109,7 +3135,7 @@ esac
  php_enable_re2c_cgoto=no
  
  echo $ac_n "checking whether to enable computed goto gcc extension with re2c""... $ac_c" 1>&6
 -echo "configure:3113: checking whether to enable computed goto gcc extension with re2c" >&5
-+echo "configure:3137: checking whether to enable computed goto gcc extension with re2c" >&5
++echo "configure:3139: checking whether to enable computed goto gcc extension with re2c" >&5
  # Check whether --enable-re2c-cgoto or --disable-re2c-cgoto was given.
  if test "${enable_re2c_cgoto+set}" = set; then
    enableval="$enable_re2c_cgoto"
-@@ -3132,9 +3156,9 @@
+@@ -3132,9 +3158,9 @@ if test "$PHP_RE2C_CGOTO" = "no"; then
    RE2C_FLAGS=""
  else
    echo $ac_n "checking whether re2c -g works""... $ac_c" 1>&6
 -echo "configure:3136: checking whether re2c -g works" >&5
-+echo "configure:3160: checking whether re2c -g works" >&5
++echo "configure:3162: checking whether re2c -g works" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 3138 "configure"
-+#line 3162 "configure"
++#line 3164 "configure"
  #include "confdefs.h"
  
  int main() {
-@@ -3152,7 +3176,7 @@
+@@ -3152,7 +3178,7 @@ label2:
    
  ; return 0; }
  EOF
 -if { (eval echo configure:3156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3182: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      RE2C_FLAGS=""
-@@ -3218,7 +3242,7 @@
+@@ -3218,7 +3244,7 @@ case $host_alias in
        
    gcc_arg_name=ac_cv_gcc_arg_no_cpp_precomp
    echo $ac_n "checking whether $CC supports -no-cpp-precomp""... $ac_c" 1>&6
 -echo "configure:3222: checking whether $CC supports -no-cpp-precomp" >&5
-+echo "configure:3246: checking whether $CC supports -no-cpp-precomp" >&5
++echo "configure:3248: checking whether $CC supports -no-cpp-precomp" >&5
  if eval "test \"`echo '$''{'ac_cv_gcc_arg_no_cpp_precomp'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -3419,7 +3443,7 @@
+@@ -3419,7 +3445,7 @@ esac
  # Disable PIC mode by default where it is known to be safe to do so,
  # to avoid the performance hit from the lost register
  echo $ac_n "checking whether to force non-PIC code in shared modules""... $ac_c" 1>&6
 -echo "configure:3423: checking whether to force non-PIC code in shared modules" >&5
-+echo "configure:3447: checking whether to force non-PIC code in shared modules" >&5
++echo "configure:3449: checking whether to force non-PIC code in shared modules" >&5
  case $host_alias in
    i?86-*-linux*|i?86-*-freebsd*)
      if test "${with_pic+set}" != "set" || test "$with_pic" = "no"; then
-@@ -3449,7 +3473,7 @@
+@@ -3449,7 +3475,7 @@ esac
  
  
  echo $ac_n "checking whether /dev/urandom exists""... $ac_c" 1>&6
 -echo "configure:3453: checking whether /dev/urandom exists" >&5 
-+echo "configure:3477: checking whether /dev/urandom exists" >&5 
++echo "configure:3479: checking whether /dev/urandom exists" >&5 
  if test -r "/dev/urandom" && test -c "/dev/urandom"; then 
    cat >> confdefs.h <<\EOF
  #define HAVE_DEV_URANDOM 1
-@@ -3510,7 +3534,7 @@
+@@ -3510,7 +3536,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 3514 "configure"
-+#line 3538 "configure"
++#line 3540 "configure"
  #include "confdefs.h"
  
  #include <pthread.h>
-@@ -3528,7 +3552,7 @@
+@@ -3528,7 +3554,7 @@ int main() {
      return pthread_create(&thd, NULL, thread_routine, &data);
  } 
  EOF
 -if { (eval echo configure:3532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:3556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    pthreads_working=yes
-@@ -3548,7 +3572,7 @@
+@@ -3548,7 +3574,7 @@ fi
    CFLAGS=$save_CFLAGS
  
    echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6
 -echo "configure:3552: checking for pthreads_cflags" >&5
-+echo "configure:3576: checking for pthreads_cflags" >&5
++echo "configure:3578: checking for pthreads_cflags" >&5
  if eval "test \"`echo '$''{'ac_cv_pthreads_cflags'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -3570,7 +3594,7 @@
+@@ -3570,7 +3596,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 3574 "configure"
-+#line 3598 "configure"
++#line 3600 "configure"
  #include "confdefs.h"
  
  #include <pthread.h>
-@@ -3588,7 +3612,7 @@
+@@ -3588,7 +3614,7 @@ int main() {
      return pthread_create(&thd, NULL, thread_routine, &data);
  } 
  EOF
 -if { (eval echo configure:3592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:3616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    pthreads_working=yes
-@@ -3618,7 +3642,7 @@
+@@ -3618,7 +3644,7 @@ fi
  echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6
  
  echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6
 -echo "configure:3622: checking for pthreads_lib" >&5
-+echo "configure:3646: checking for pthreads_lib" >&5
++echo "configure:3648: checking for pthreads_lib" >&5
  if eval "test \"`echo '$''{'ac_cv_pthreads_lib'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -3640,7 +3664,7 @@
+@@ -3640,7 +3666,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 3644 "configure"
-+#line 3668 "configure"
++#line 3670 "configure"
  #include "confdefs.h"
  
  #include <pthread.h>
-@@ -3658,7 +3682,7 @@
+@@ -3658,7 +3684,7 @@ int main() {
      return pthread_create(&thd, NULL, thread_routine, &data);
  } 
  EOF
 -if { (eval echo configure:3662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:3686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    pthreads_working=yes
-@@ -3789,7 +3813,7 @@
+@@ -3789,7 +3815,7 @@ ext_output=$PHP_AOLSERVER
  
  
  echo $ac_n "checking for AOLserver support""... $ac_c" 1>&6
 -echo "configure:3793: checking for AOLserver support" >&5
-+echo "configure:3817: checking for AOLserver support" >&5
++echo "configure:3819: checking for AOLserver support" >&5
  
  if test "$PHP_AOLSERVER" != "no"; then
    if test -d "$PHP_AOLSERVER/include"; then
-@@ -4054,7 +4078,7 @@
+@@ -4054,7 +4080,7 @@ ext_output=$PHP_APXS
  
  
  echo $ac_n "checking for Apache 1.x module support via DSO through APXS""... $ac_c" 1>&6
 -echo "configure:4058: checking for Apache 1.x module support via DSO through APXS" >&5
-+echo "configure:4082: checking for Apache 1.x module support via DSO through APXS" >&5
++echo "configure:4084: checking for Apache 1.x module support via DSO through APXS" >&5
  
  if test "$PHP_APXS" != "no"; then
    if test "$PHP_APXS" = "yes"; then
-@@ -4385,7 +4409,7 @@
+@@ -4385,7 +4411,7 @@ ext_output=$PHP_APACHE
  
  
  echo $ac_n "checking for Apache 1.x module support""... $ac_c" 1>&6
 -echo "configure:4389: checking for Apache 1.x module support" >&5
-+echo "configure:4413: checking for Apache 1.x module support" >&5
++echo "configure:4415: checking for Apache 1.x module support" >&5
  
  if test "$PHP_SAPI" != "apache" && test "$PHP_APACHE" != "no"; then
    
-@@ -5262,7 +5286,7 @@
+@@ -5262,7 +5288,7 @@ fi
  php_enable_mod_charset=no
  
  echo $ac_n "checking whether to enable Apache charset compatibility option""... $ac_c" 1>&6
 -echo "configure:5266: checking whether to enable Apache charset compatibility option" >&5
-+echo "configure:5290: checking whether to enable Apache charset compatibility option" >&5
++echo "configure:5292: checking whether to enable Apache charset compatibility option" >&5
  # Check whether --enable-mod-charset or --disable-mod-charset was given.
  if test "${enable_mod_charset+set}" = set; then
    enableval="$enable_mod_charset"
-@@ -5294,7 +5318,7 @@
+@@ -5294,7 +5320,7 @@ if test "$APACHE_MODULE" = "yes"; then
          
    gcc_arg_name=ac_cv_gcc_arg_rdynamic
    echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6
 -echo "configure:5298: checking whether $CC supports -rdynamic" >&5
-+echo "configure:5322: checking whether $CC supports -rdynamic" >&5
++echo "configure:5324: checking whether $CC supports -rdynamic" >&5
  if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5337,7 +5361,7 @@
+@@ -5337,7 +5363,7 @@ if test -n "$APACHE_INSTALL"; then
  
    
  echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6
 -echo "configure:5341: checking for member fd in BUFF *" >&5
-+echo "configure:5365: checking for member fd in BUFF *" >&5
++echo "configure:5367: checking for member fd in BUFF *" >&5
  if eval "test \"`echo '$''{'ac_cv_php_fd_in_buff'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -5349,14 +5373,14 @@
+@@ -5349,14 +5375,14 @@ else
      CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE"
    fi
    cat > conftest.$ac_ext <<EOF
 -#line 5353 "configure"
-+#line 5377 "configure"
++#line 5379 "configure"
  #include "confdefs.h"
  #include <httpd.h>
  int main() {
@@ -712,79 +721,79 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:5360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:5384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:5386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      ac_cv_php_fd_in_buff=yes
-@@ -5429,7 +5453,7 @@
+@@ -5429,7 +5455,7 @@ ext_output=$PHP_APXS2FILTER
  
  
  echo $ac_n "checking for Apache 2.0 filter-module support via DSO through APXS""... $ac_c" 1>&6
 -echo "configure:5433: checking for Apache 2.0 filter-module support via DSO through APXS" >&5
-+echo "configure:5457: checking for Apache 2.0 filter-module support via DSO through APXS" >&5
++echo "configure:5459: checking for Apache 2.0 filter-module support via DSO through APXS" >&5
  
  if test "$PHP_APXS2FILTER" != "no"; then
    if test "$PHP_APXS2FILTER" = "yes"; then
-@@ -6318,7 +6342,7 @@
+@@ -6318,7 +6344,7 @@ ext_output=$PHP_APXS2
  
  
  echo $ac_n "checking for Apache 2.0 handler-module support via DSO through APXS""... $ac_c" 1>&6
 -echo "configure:6322: checking for Apache 2.0 handler-module support via DSO through APXS" >&5
-+echo "configure:6346: checking for Apache 2.0 handler-module support via DSO through APXS" >&5
++echo "configure:6348: checking for Apache 2.0 handler-module support via DSO through APXS" >&5
  
  if test "$PHP_APXS2" != "no"; then
    if test "$PHP_APXS2" = "yes"; then
-@@ -7208,7 +7232,7 @@
+@@ -7208,7 +7234,7 @@ ext_output=$PHP_APACHE_HOOKS
  
  
  echo $ac_n "checking for Apache 1.x (hooks) module support via DSO through APXS""... $ac_c" 1>&6
 -echo "configure:7212: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5
-+echo "configure:7236: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5
++echo "configure:7238: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5
  
  if test "$PHP_APACHE_HOOKS" != "no"; then
    if test "$PHP_APACHE_HOOKS" = "yes"; then
-@@ -7539,7 +7563,7 @@
+@@ -7539,7 +7565,7 @@ ext_output=$PHP_APACHE_HOOKS_STATIC
  
  
  echo $ac_n "checking for Apache 1.x (hooks) module support""... $ac_c" 1>&6
 -echo "configure:7543: checking for Apache 1.x (hooks) module support" >&5
-+echo "configure:7567: checking for Apache 1.x (hooks) module support" >&5
++echo "configure:7569: checking for Apache 1.x (hooks) module support" >&5
  
  if test "$PHP_SAPI" != "apache" && test "$PHP_SAPI" != "apache_hooks" && test "$PHP_APACHE_HOOKS_STATIC" != "no"; then
  
-@@ -8416,7 +8440,7 @@
+@@ -8416,7 +8442,7 @@ fi
  php_enable_mod_charset=no
  
  echo $ac_n "checking whether to enable Apache charset compatibility option""... $ac_c" 1>&6
 -echo "configure:8420: checking whether to enable Apache charset compatibility option" >&5
-+echo "configure:8444: checking whether to enable Apache charset compatibility option" >&5
++echo "configure:8446: checking whether to enable Apache charset compatibility option" >&5
  # Check whether --enable-mod-charset or --disable-mod-charset was given.
  if test "${enable_mod_charset+set}" = set; then
    enableval="$enable_mod_charset"
-@@ -8448,7 +8472,7 @@
+@@ -8448,7 +8474,7 @@ if test "$APACHE_HOOKS_MODULE" = "yes"; then
          
    gcc_arg_name=ac_cv_gcc_arg_rdynamic
    echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6
 -echo "configure:8452: checking whether $CC supports -rdynamic" >&5
-+echo "configure:8476: checking whether $CC supports -rdynamic" >&5
++echo "configure:8478: checking whether $CC supports -rdynamic" >&5
  if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -8491,7 +8515,7 @@
+@@ -8491,7 +8517,7 @@ if test -n "$APACHE_HOOKS_INSTALL"; then
  
    
  echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6
 -echo "configure:8495: checking for member fd in BUFF *" >&5
-+echo "configure:8519: checking for member fd in BUFF *" >&5
++echo "configure:8521: checking for member fd in BUFF *" >&5
  if eval "test \"`echo '$''{'ac_cv_php_fd_in_buff'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -8503,14 +8527,14 @@
+@@ -8503,14 +8529,14 @@ else
      CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE"
    fi
    cat > conftest.$ac_ext <<EOF
 -#line 8507 "configure"
-+#line 8531 "configure"
++#line 8533 "configure"
  #include "confdefs.h"
  #include <httpd.h>
  int main() {
@@ -792,103 +801,103 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:8514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:8538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      ac_cv_php_fd_in_buff=yes
-@@ -8584,7 +8608,7 @@
+@@ -8584,7 +8610,7 @@ ext_output=$PHP_CAUDIUM
  
  
  echo $ac_n "checking for Caudium support""... $ac_c" 1>&6
 -echo "configure:8588: checking for Caudium support" >&5
-+echo "configure:8612: checking for Caudium support" >&5
++echo "configure:8614: checking for Caudium support" >&5
  
  if test "$PHP_CAUDIUM" != "no"; then
    if test "$prefix" = "NONE"; then CPREF=/usr/local/; fi
-@@ -8654,7 +8678,7 @@
+@@ -8654,7 +8680,7 @@ if test "$PHP_CAUDIUM" != "no"; then
        PIKE_C_INCLUDE=/usr/local/include/`basename $PIKE`
      fi
      echo $ac_n "checking for C includes in $PIKE_C_INCLUDE""... $ac_c" 1>&6
 -echo "configure:8658: checking for C includes in $PIKE_C_INCLUDE" >&5
-+echo "configure:8682: checking for C includes in $PIKE_C_INCLUDE" >&5
++echo "configure:8684: checking for C includes in $PIKE_C_INCLUDE" >&5
      if test -f $PIKE_C_INCLUDE/version.h; then
        PIKE_TEST_VER=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'`
        ###### VERSION MATCH CHECK #######
-@@ -8943,7 +8967,7 @@
+@@ -8943,7 +8969,7 @@ ext_output=$PHP_CLI
  
  
  echo $ac_n "checking for CLI build""... $ac_c" 1>&6
 -echo "configure:8947: checking for CLI build" >&5
-+echo "configure:8971: checking for CLI build" >&5
++echo "configure:8973: checking for CLI build" >&5
  if test "$PHP_CLI" != "no"; then
    
    src=$abs_srcdir/sapi/cli/Makefile.frag
-@@ -8993,7 +9017,7 @@
+@@ -8993,7 +9019,7 @@ echo "$ac_t""$PHP_CLI" 1>&6
  php_with_continuity=no
  
  echo $ac_n "checking for Continuity support""... $ac_c" 1>&6
 -echo "configure:8997: checking for Continuity support" >&5
-+echo "configure:9021: checking for Continuity support" >&5
++echo "configure:9023: checking for Continuity support" >&5
  # Check whether --with-continuity or --without-continuity was given.
  if test "${with_continuity+set}" = set; then
    withval="$with_continuity"
-@@ -9017,7 +9041,7 @@
+@@ -9017,7 +9043,7 @@ if test "$PHP_CONTINUITY" != "no"; then
      { echo "configure: error: Please specify the path to the root of your Continuity server using --with-continuity=DIR" 1>&2; exit 1; }
    fi
    echo $ac_n "checking for Continuity include files""... $ac_c" 1>&6
 -echo "configure:9021: checking for Continuity include files" >&5
-+echo "configure:9045: checking for Continuity include files" >&5
++echo "configure:9047: checking for Continuity include files" >&5
    if test -d $PHP_CONTINUITY/include ; then
      CAPI_INCLUDE=$PHP_CONTINUITY/include
      echo "$ac_t""Continuity Binary Distribution" 1>&6
-@@ -9275,7 +9299,7 @@
+@@ -9275,7 +9301,7 @@ ext_output=$PHP_EMBED
  
  
  echo $ac_n "checking for embedded SAPI library support""... $ac_c" 1>&6
 -echo "configure:9279: checking for embedded SAPI library support" >&5
-+echo "configure:9303: checking for embedded SAPI library support" >&5
++echo "configure:9305: checking for embedded SAPI library support" >&5
  
  if test "$PHP_EMBED" != "no"; then
    case "$PHP_EMBED" in
-@@ -9534,7 +9558,7 @@
+@@ -9534,7 +9560,7 @@ ext_output=$PHP_FPM
  
  
  echo $ac_n "checking for FPM build""... $ac_c" 1>&6
 -echo "configure:9538: checking for FPM build" >&5
-+echo "configure:9562: checking for FPM build" >&5
++echo "configure:9564: checking for FPM build" >&5
  if test "$PHP_FPM" != "no"; then
    echo "$ac_t""$PHP_FPM" 1>&6
  
-@@ -9542,12 +9566,12 @@
+@@ -9542,12 +9568,12 @@ if test "$PHP_FPM" != "no"; then
    for ac_func in setenv clearenv setproctitle
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:9546: checking for $ac_func" >&5
-+echo "configure:9570: checking for $ac_func" >&5
++echo "configure:9572: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 9551 "configure"
-+#line 9575 "configure"
++#line 9577 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -9570,7 +9594,7 @@
+@@ -9570,7 +9596,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:9574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -9597,14 +9621,14 @@
+@@ -9597,14 +9623,14 @@ done
  
    
  echo $ac_n "checking for library containing socket""... $ac_c" 1>&6
 -echo "configure:9601: checking for library containing socket" >&5
-+echo "configure:9625: checking for library containing socket" >&5
++echo "configure:9627: checking for library containing socket" >&5
  if eval "test \"`echo '$''{'ac_cv_search_socket'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -896,43 +905,43 @@
  ac_cv_search_socket="no"
  cat > conftest.$ac_ext <<EOF
 -#line 9608 "configure"
-+#line 9632 "configure"
++#line 9634 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -9615,7 +9639,7 @@
+@@ -9615,7 +9641,7 @@ int main() {
  socket()
  ; return 0; }
  EOF
 -if { (eval echo configure:9619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_search_socket="none required"
  else
-@@ -9626,7 +9650,7 @@
+@@ -9626,7 +9652,7 @@ rm -f conftest*
  test "$ac_cv_search_socket" = "no" && for i in socket; do
  LIBS="-l$i  $ac_func_search_save_LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 9630 "configure"
-+#line 9654 "configure"
++#line 9656 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -9637,7 +9661,7 @@
+@@ -9637,7 +9663,7 @@ int main() {
  socket()
  ; return 0; }
  EOF
 -if { (eval echo configure:9641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_search_socket="-l$i"
  break
-@@ -9659,14 +9683,14 @@
+@@ -9659,14 +9685,14 @@ else :
  fi
    
  echo $ac_n "checking for library containing inet_addr""... $ac_c" 1>&6
 -echo "configure:9663: checking for library containing inet_addr" >&5
-+echo "configure:9687: checking for library containing inet_addr" >&5
++echo "configure:9689: checking for library containing inet_addr" >&5
  if eval "test \"`echo '$''{'ac_cv_search_inet_addr'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -940,110 +949,110 @@
  ac_cv_search_inet_addr="no"
  cat > conftest.$ac_ext <<EOF
 -#line 9670 "configure"
-+#line 9694 "configure"
++#line 9696 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -9677,7 +9701,7 @@
+@@ -9677,7 +9703,7 @@ int main() {
  inet_addr()
  ; return 0; }
  EOF
 -if { (eval echo configure:9681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_search_inet_addr="none required"
  else
-@@ -9688,7 +9712,7 @@
+@@ -9688,7 +9714,7 @@ rm -f conftest*
  test "$ac_cv_search_inet_addr" = "no" && for i in nsl; do
  LIBS="-l$i  $ac_func_search_save_LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 9692 "configure"
-+#line 9716 "configure"
++#line 9718 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -9699,7 +9723,7 @@
+@@ -9699,7 +9725,7 @@ int main() {
  inet_addr()
  ; return 0; }
  EOF
 -if { (eval echo configure:9703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_search_inet_addr="-l$i"
  break
-@@ -9724,17 +9748,17 @@
+@@ -9724,17 +9750,17 @@ fi
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:9728: checking for $ac_hdr" >&5
-+echo "configure:9752: checking for $ac_hdr" >&5
++echo "configure:9754: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 9733 "configure"
-+#line 9757 "configure"
++#line 9759 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:9738: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:9762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:9764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -9764,17 +9788,17 @@
+@@ -9764,17 +9790,17 @@ done
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:9768: checking for $ac_hdr" >&5
-+echo "configure:9792: checking for $ac_hdr" >&5
++echo "configure:9794: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 9773 "configure"
-+#line 9797 "configure"
++#line 9799 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:9778: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:9802: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:9804: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -9804,17 +9828,17 @@
+@@ -9804,17 +9830,17 @@ done
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:9808: checking for $ac_hdr" >&5
-+echo "configure:9832: checking for $ac_hdr" >&5
++echo "configure:9834: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 9813 "configure"
-+#line 9837 "configure"
++#line 9839 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:9818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:9842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:9844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -9843,17 +9867,17 @@
+@@ -9843,17 +9869,17 @@ done
  
    
    echo $ac_n "checking for prctl""... $ac_c" 1>&6
 -echo "configure:9847: checking for prctl" >&5
-+echo "configure:9871: checking for prctl" >&5
++echo "configure:9873: checking for prctl" >&5
  
    cat > conftest.$ac_ext <<EOF
 -#line 9850 "configure"
-+#line 9874 "configure"
++#line 9876 "configure"
  #include "confdefs.h"
   #include <sys/prctl.h> 
  int main() {
@@ -1051,20 +1060,20 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:9857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:9881: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      cat >> confdefs.h <<\EOF
-@@ -9876,17 +9900,17 @@
+@@ -9876,17 +9902,17 @@ rm -f conftest*
    have_clock_gettime=no
  
    echo $ac_n "checking for clock_gettime""... $ac_c" 1>&6
 -echo "configure:9880: checking for clock_gettime" >&5
-+echo "configure:9904: checking for clock_gettime" >&5
++echo "configure:9906: checking for clock_gettime" >&5
  
    cat > conftest.$ac_ext <<EOF
 -#line 9883 "configure"
-+#line 9907 "configure"
++#line 9909 "configure"
  #include "confdefs.h"
   #include <time.h> 
  int main() {
@@ -1072,23 +1081,23 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:9890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    
      have_clock_gettime=yes
-@@ -9904,20 +9928,20 @@
+@@ -9904,20 +9930,20 @@ rm -f conftest*
  
    if test "$have_clock_gettime" = "no"; then
      echo $ac_n "checking for clock_gettime in -lrt""... $ac_c" 1>&6
 -echo "configure:9908: checking for clock_gettime in -lrt" >&5
-+echo "configure:9932: checking for clock_gettime in -lrt" >&5
++echo "configure:9934: checking for clock_gettime in -lrt" >&5
  
      SAVED_LIBS="$LIBS"
      LIBS="$LIBS -lrt"
  
      cat > conftest.$ac_ext <<EOF
 -#line 9914 "configure"
-+#line 9938 "configure"
++#line 9940 "configure"
  #include "confdefs.h"
   #include <time.h> 
  int main() {
@@ -1096,160 +1105,160 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:9921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:9945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    
        have_clock_gettime=yes
-@@ -9946,13 +9970,13 @@
+@@ -9946,13 +9972,13 @@ EOF
  
    if test "$have_clock_gettime" = "no"; then
      echo $ac_n "checking for clock_get_time""... $ac_c" 1>&6
 -echo "configure:9950: checking for clock_get_time" >&5
-+echo "configure:9974: checking for clock_get_time" >&5
++echo "configure:9976: checking for clock_get_time" >&5
  
      if test "$cross_compiling" = yes; then
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
 -#line 9956 "configure"
-+#line 9980 "configure"
++#line 9982 "configure"
  #include "confdefs.h"
   #include <mach/mach.h>
        #include <mach/clock.h>
-@@ -9976,7 +10000,7 @@
+@@ -9976,7 +10002,7 @@ else
        }
      
  EOF
 -if { (eval echo configure:9980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
        have_clock_get_time=yes
-@@ -10007,10 +10031,10 @@
+@@ -10007,10 +10033,10 @@ EOF
    have_broken_ptrace=no
  
    echo $ac_n "checking for ptrace""... $ac_c" 1>&6
 -echo "configure:10011: checking for ptrace" >&5
-+echo "configure:10035: checking for ptrace" >&5
++echo "configure:10037: checking for ptrace" >&5
  
    cat > conftest.$ac_ext <<EOF
 -#line 10014 "configure"
-+#line 10038 "configure"
++#line 10040 "configure"
  #include "confdefs.h"
  
      #include <sys/types.h>
-@@ -10019,7 +10043,7 @@
+@@ -10019,7 +10045,7 @@ int main() {
  ptrace(0, 0, (void *) 0, 0);
  ; return 0; }
  EOF
 -if { (eval echo configure:10023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:10047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      have_ptrace=yes
-@@ -10037,13 +10061,13 @@
+@@ -10037,13 +10063,13 @@ rm -f conftest*
  
    if test "$have_ptrace" = "yes"; then
      echo $ac_n "checking whether ptrace works""... $ac_c" 1>&6
 -echo "configure:10041: checking whether ptrace works" >&5
-+echo "configure:10065: checking whether ptrace works" >&5
++echo "configure:10067: checking whether ptrace works" >&5
  
      if test "$cross_compiling" = yes; then
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
 -#line 10047 "configure"
-+#line 10071 "configure"
++#line 10073 "configure"
  #include "confdefs.h"
  
        #include <unistd.h>
-@@ -10114,7 +10138,7 @@
+@@ -10114,7 +10140,7 @@ else
        }
      
  EOF
 -if { (eval echo configure:10118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
        echo "$ac_t""yes" 1>&6
-@@ -10145,10 +10169,10 @@
+@@ -10145,10 +10171,10 @@ EOF
  
    if test "$have_broken_ptrace" = "yes"; then
      echo $ac_n "checking for mach_vm_read""... $ac_c" 1>&6
 -echo "configure:10149: checking for mach_vm_read" >&5
-+echo "configure:10173: checking for mach_vm_read" >&5
++echo "configure:10175: checking for mach_vm_read" >&5
  
      cat > conftest.$ac_ext <<EOF
 -#line 10152 "configure"
-+#line 10176 "configure"
++#line 10178 "configure"
  #include "confdefs.h"
   #include <mach/mach.h>
        #include <mach/mach_vm.h>
-@@ -10159,7 +10183,7 @@
+@@ -10159,7 +10185,7 @@ int main() {
      
  ; return 0; }
  EOF
 -if { (eval echo configure:10163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:10187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
        have_mach_vm_read=yes
-@@ -10195,13 +10219,13 @@
+@@ -10195,13 +10221,13 @@ EOF
  
    if test -n "$proc_mem_file" ; then
      echo $ac_n "checking for proc mem file""... $ac_c" 1>&6
 -echo "configure:10199: checking for proc mem file" >&5
-+echo "configure:10223: checking for proc mem file" >&5
++echo "configure:10225: checking for proc mem file" >&5
    
      if test "$cross_compiling" = yes; then
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
    cat > conftest.$ac_ext <<EOF
 -#line 10205 "configure"
-+#line 10229 "configure"
++#line 10231 "configure"
  #include "confdefs.h"
  
        #define _GNU_SOURCE
-@@ -10231,7 +10255,7 @@
+@@ -10231,7 +10257,7 @@ else
        }
      
  EOF
 -if { (eval echo configure:10235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:10259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
        echo "$ac_t""$proc_mem_file" 1>&6
-@@ -10275,9 +10299,9 @@
+@@ -10275,9 +10301,9 @@ EOF
  
    
    echo $ac_n "checking if gcc supports __sync_bool_compare_and_swap""... $ac_c" 1>&6
 -echo "configure:10279: checking if gcc supports __sync_bool_compare_and_swap" >&5
-+echo "configure:10303: checking if gcc supports __sync_bool_compare_and_swap" >&5
++echo "configure:10305: checking if gcc supports __sync_bool_compare_and_swap" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 10281 "configure"
-+#line 10305 "configure"
++#line 10307 "configure"
  #include "confdefs.h"
  
  int main() {
-@@ -10288,7 +10312,7 @@
+@@ -10288,7 +10314,7 @@ int main() {
    
  ; return 0; }
  EOF
 -if { (eval echo configure:10292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:10316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    
      echo "$ac_t""yes" 1>&6
-@@ -10311,17 +10335,17 @@
+@@ -10311,17 +10337,17 @@ rm -f conftest*
    have_lq=no
  
    echo $ac_n "checking for TCP_INFO""... $ac_c" 1>&6
 -echo "configure:10315: checking for TCP_INFO" >&5
-+echo "configure:10339: checking for TCP_INFO" >&5
++echo "configure:10341: checking for TCP_INFO" >&5
  
    cat > conftest.$ac_ext <<EOF
 -#line 10318 "configure"
-+#line 10342 "configure"
++#line 10344 "configure"
  #include "confdefs.h"
   #include <netinet/tcp.h> 
  int main() {
@@ -1257,20 +1266,20 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:10325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:10349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      have_lq=tcp_info
-@@ -10346,17 +10370,17 @@
+@@ -10346,17 +10372,17 @@ EOF
  
    if test "$have_lq" = "no" ; then
      echo $ac_n "checking for SO_LISTENQLEN""... $ac_c" 1>&6
 -echo "configure:10350: checking for SO_LISTENQLEN" >&5
-+echo "configure:10374: checking for SO_LISTENQLEN" >&5
++echo "configure:10376: checking for SO_LISTENQLEN" >&5
  
      cat > conftest.$ac_ext <<EOF
 -#line 10353 "configure"
-+#line 10377 "configure"
++#line 10379 "configure"
  #include "confdefs.h"
   #include <sys/socket.h> 
  int main() {
@@ -1278,157 +1287,157 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:10360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:10384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
        have_lq=so_listenq
-@@ -10732,7 +10756,7 @@
+@@ -10732,7 +10758,7 @@ fi
  php_with_isapi=no
  
  echo $ac_n "checking for Zeus ISAPI support""... $ac_c" 1>&6
 -echo "configure:10736: checking for Zeus ISAPI support" >&5
-+echo "configure:10760: checking for Zeus ISAPI support" >&5
++echo "configure:10762: checking for Zeus ISAPI support" >&5
  # Check whether --with-isapi or --without-isapi was given.
  if test "${with_isapi+set}" = set; then
    withval="$with_isapi"
-@@ -10986,7 +11010,7 @@
+@@ -10986,7 +11012,7 @@ fi
  
  
  echo $ac_n "checking for LiteSpeed support""... $ac_c" 1>&6
 -echo "configure:10990: checking for LiteSpeed support" >&5
-+echo "configure:11014: checking for LiteSpeed support" >&5
++echo "configure:11016: checking for LiteSpeed support" >&5
  
  
  php_with_litespeed=no
-@@ -11249,7 +11273,7 @@
+@@ -11249,7 +11275,7 @@ echo "$ac_t""$PHP_LITESPEED" 1>&6
  php_with_milter=no
  
  echo $ac_n "checking for Milter support""... $ac_c" 1>&6
 -echo "configure:11253: checking for Milter support" >&5
-+echo "configure:11277: checking for Milter support" >&5
++echo "configure:11279: checking for Milter support" >&5
  # Check whether --with-milter or --without-milter was given.
  if test "${with_milter+set}" = set; then
    withval="$with_milter"
-@@ -11541,7 +11565,7 @@
+@@ -11541,7 +11567,7 @@ fi
  php_with_nsapi=no
  
  echo $ac_n "checking for NSAPI support""... $ac_c" 1>&6
 -echo "configure:11545: checking for NSAPI support" >&5
-+echo "configure:11569: checking for NSAPI support" >&5
++echo "configure:11571: checking for NSAPI support" >&5
  # Check whether --with-nsapi or --without-nsapi was given.
  if test "${with_nsapi+set}" = set; then
    withval="$with_nsapi"
-@@ -11565,7 +11589,7 @@
+@@ -11565,7 +11591,7 @@ if test "$PHP_NSAPI" != "no"; then
      { echo "configure: error: Please specify the path to the root of your Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR" 1>&2; exit 1; }
    fi
    echo $ac_n "checking for NSAPI include files""... $ac_c" 1>&6
 -echo "configure:11569: checking for NSAPI include files" >&5
-+echo "configure:11593: checking for NSAPI include files" >&5
++echo "configure:11595: checking for NSAPI include files" >&5
    if test -d $PHP_NSAPI/include ; then
      NSAPI_INC_DIR="$PHP_NSAPI/include"
      echo "$ac_t""Netscape 3.x / Sun 7.x style" 1>&6
-@@ -11573,17 +11597,17 @@
+@@ -11573,17 +11599,17 @@ echo "configure:11569: checking for NSAPI include files" >&5
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:11577: checking for $ac_hdr" >&5
-+echo "configure:11601: checking for $ac_hdr" >&5
++echo "configure:11603: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 11582 "configure"
-+#line 11606 "configure"
++#line 11608 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:11587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:11611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:11613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -11618,17 +11642,17 @@
+@@ -11618,17 +11644,17 @@ done
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:11622: checking for $ac_hdr" >&5
-+echo "configure:11646: checking for $ac_hdr" >&5
++echo "configure:11648: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 11627 "configure"
-+#line 11651 "configure"
++#line 11653 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:11632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:11656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:11658: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -11901,7 +11925,7 @@
+@@ -11901,7 +11927,7 @@ fi
  php_with_phttpd=no
  
  echo $ac_n "checking for PHTTPD support""... $ac_c" 1>&6
 -echo "configure:11905: checking for PHTTPD support" >&5
-+echo "configure:11929: checking for PHTTPD support" >&5
++echo "configure:11931: checking for PHTTPD support" >&5
  # Check whether --with-phttpd or --without-phttpd was given.
  if test "${with_phttpd+set}" = set; then
    withval="$with_phttpd"
-@@ -12155,7 +12179,7 @@
+@@ -12155,7 +12181,7 @@ fi
  php_with_pi3web=no
  
  echo $ac_n "checking for Pi3Web support""... $ac_c" 1>&6
 -echo "configure:12159: checking for Pi3Web support" >&5
-+echo "configure:12183: checking for Pi3Web support" >&5
++echo "configure:12185: checking for Pi3Web support" >&5
  # Check whether --with-pi3web or --without-pi3web was given.
  if test "${with_pi3web+set}" = set; then
    withval="$with_pi3web"
-@@ -12527,7 +12551,7 @@
+@@ -12527,7 +12553,7 @@ ext_output=$PHP_ROXEN
  php_enable_roxen_zts=no
  
  echo $ac_n "checking whether Roxen module is build using ZTS""... $ac_c" 1>&6
 -echo "configure:12531: checking whether Roxen module is build using ZTS" >&5
-+echo "configure:12555: checking whether Roxen module is build using ZTS" >&5
++echo "configure:12557: checking whether Roxen module is build using ZTS" >&5
  # Check whether --enable-roxen-zts or --disable-roxen-zts was given.
  if test "${enable_roxen_zts+set}" = set; then
    enableval="$enable_roxen_zts"
-@@ -12548,7 +12572,7 @@
+@@ -12548,7 +12574,7 @@ echo "$ac_t""$ext_output" 1>&6
  
  RESULT=
  echo $ac_n "checking for Roxen/Pike support""... $ac_c" 1>&6
 -echo "configure:12552: checking for Roxen/Pike support" >&5
-+echo "configure:12576: checking for Roxen/Pike support" >&5
++echo "configure:12578: checking for Roxen/Pike support" >&5
  if test "$PHP_ROXEN" != "no"; then
    if test ! -d $PHP_ROXEN ; then
      { echo "configure: error: You did not specify a directory" 1>&2; exit 1; }
-@@ -12834,7 +12858,7 @@
+@@ -12834,7 +12860,7 @@ ext_output=$PHP_THTTPD
  
  
  echo $ac_n "checking for thttpd""... $ac_c" 1>&6
 -echo "configure:12838: checking for thttpd" >&5
-+echo "configure:12862: checking for thttpd" >&5
++echo "configure:12864: checking for thttpd" >&5
  
  if test "$PHP_THTTPD" != "no"; then
    if test ! -d $PHP_THTTPD; then
-@@ -12867,7 +12891,7 @@
+@@ -12867,7 +12893,7 @@ if test "$PHP_THTTPD" != "no"; then
          
    gcc_arg_name=ac_cv_gcc_arg_rdynamic
    echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6
 -echo "configure:12871: checking whether $CC supports -rdynamic" >&5
-+echo "configure:12895: checking whether $CC supports -rdynamic" >&5
++echo "configure:12897: checking whether $CC supports -rdynamic" >&5
  if eval "test \"`echo '$''{'ac_cv_gcc_arg_rdynamic'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -13103,24 +13127,24 @@
+@@ -13103,24 +13129,24 @@ ext_output=$PHP_TUX
  
  
  echo $ac_n "checking for TUX""... $ac_c" 1>&6
 -echo "configure:13107: checking for TUX" >&5
-+echo "configure:13131: checking for TUX" >&5
++echo "configure:13133: checking for TUX" >&5
  if test "$PHP_TUX" != "no"; then
    INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_TUX/php5.tux.so"
    for ac_hdr in tuxmodule.h
@@ -1436,1444 +1445,1444 @@
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:13114: checking for $ac_hdr" >&5
-+echo "configure:13138: checking for $ac_hdr" >&5
++echo "configure:13140: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 13119 "configure"
-+#line 13143 "configure"
++#line 13145 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:13124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:13148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:13150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -13357,7 +13381,7 @@
+@@ -13357,7 +13383,7 @@ ext_output=$PHP_WEBJAMES
  
  
  echo $ac_n "checking for webjames""... $ac_c" 1>&6
 -echo "configure:13361: checking for webjames" >&5
-+echo "configure:13385: checking for webjames" >&5
++echo "configure:13387: checking for webjames" >&5
  
  if test "$PHP_WEBJAMES" != "no"; then
    
-@@ -13617,14 +13641,14 @@
+@@ -13617,14 +13643,14 @@ ext_output=$PHP_CGI
  
  if test "$PHP_SAPI" = "default"; then
    echo $ac_n "checking whether to build CGI binary""... $ac_c" 1>&6
 -echo "configure:13621: checking whether to build CGI binary" >&5
-+echo "configure:13645: checking whether to build CGI binary" >&5
++echo "configure:13647: checking whether to build CGI binary" >&5
    if test "$PHP_CGI" != "no"; then
      echo "$ac_t""yes" 1>&6
  
      echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6
 -echo "configure:13626: checking for socklen_t in sys/socket.h" >&5
-+echo "configure:13650: checking for socklen_t in sys/socket.h" >&5
++echo "configure:13652: checking for socklen_t in sys/socket.h" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 13628 "configure"
-+#line 13652 "configure"
++#line 13654 "configure"
  #include "confdefs.h"
  #include <sys/socket.h>
  EOF
-@@ -13644,9 +13668,9 @@
+@@ -13644,9 +13670,9 @@ rm -f conftest*
  
  
      echo $ac_n "checking for sun_len in sys/un.h""... $ac_c" 1>&6
 -echo "configure:13648: checking for sun_len in sys/un.h" >&5
-+echo "configure:13672: checking for sun_len in sys/un.h" >&5
++echo "configure:13674: checking for sun_len in sys/un.h" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 13650 "configure"
-+#line 13674 "configure"
++#line 13676 "configure"
  #include "confdefs.h"
  #include <sys/un.h>
  EOF
-@@ -13666,7 +13690,7 @@
+@@ -13666,7 +13692,7 @@ rm -f conftest*
  
  
      echo $ac_n "checking whether cross-process locking is required by accept()""... $ac_c" 1>&6
 -echo "configure:13670: checking whether cross-process locking is required by accept()" >&5
-+echo "configure:13694: checking whether cross-process locking is required by accept()" >&5
++echo "configure:13696: checking whether cross-process locking is required by accept()" >&5
      case "`uname -sr`" in
        IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0)    
          echo "$ac_t""yes" 1>&6
-@@ -13910,7 +13934,7 @@
+@@ -13910,7 +13936,7 @@ fi
  
  
  echo $ac_n "checking for chosen SAPI module""... $ac_c" 1>&6
 -echo "configure:13914: checking for chosen SAPI module" >&5
-+echo "configure:13938: checking for chosen SAPI module" >&5
++echo "configure:13940: checking for chosen SAPI module" >&5
  echo "$ac_t""$PHP_SAPI" 1>&6
  
  if test "$enable_maintainer_zts" = "yes"; then
-@@ -13967,7 +13991,7 @@
+@@ -13967,7 +13993,7 @@ fi
    # Extract the first word of "sendmail", so it can be a program name with args.
  set dummy sendmail; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:13971: checking for $ac_word" >&5
-+echo "configure:13995: checking for $ac_word" >&5
++echo "configure:13997: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PROG_SENDMAIL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -14006,7 +14030,7 @@
+@@ -14006,7 +14032,7 @@ fi
  
  
    echo $ac_n "checking whether system uses EBCDIC""... $ac_c" 1>&6
 -echo "configure:14010: checking whether system uses EBCDIC" >&5
-+echo "configure:14034: checking whether system uses EBCDIC" >&5
++echo "configure:14036: checking whether system uses EBCDIC" >&5
  if eval "test \"`echo '$''{'ac_cv_ebcdic'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -14017,7 +14041,7 @@
+@@ -14017,7 +14043,7 @@ else
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 14021 "configure"
-+#line 14045 "configure"
++#line 14047 "configure"
  #include "confdefs.h"
  
  int main(void) { 
-@@ -14025,7 +14049,7 @@
+@@ -14025,7 +14051,7 @@ int main(void) {
  } 
  
  EOF
 -if { (eval echo configure:14029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:14053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:14055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    ac_cv_ebcdic=yes
-@@ -14053,7 +14077,7 @@
+@@ -14053,7 +14079,7 @@ EOF
  
  
  echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
 -echo "configure:14057: checking whether byte ordering is bigendian" >&5
-+echo "configure:14081: checking whether byte ordering is bigendian" >&5
++echo "configure:14083: checking whether byte ordering is bigendian" >&5
  if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -14063,7 +14087,7 @@
+@@ -14063,7 +14089,7 @@ else
    ac_cv_c_bigendian_php=unknown
  else
    cat > conftest.$ac_ext <<EOF
 -#line 14067 "configure"
-+#line 14091 "configure"
++#line 14093 "configure"
  #include "confdefs.h"
  
  int main(void)
-@@ -14079,7 +14103,7 @@
+@@ -14079,7 +14105,7 @@ int main(void)
  }
    
  EOF
 -if { (eval echo configure:14083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:14107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:14109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_bigendian_php=yes
  else
-@@ -14105,7 +14129,7 @@
+@@ -14105,7 +14131,7 @@ EOF
  
  
    echo $ac_n "checking whether writing to stdout works""... $ac_c" 1>&6
 -echo "configure:14109: checking whether writing to stdout works" >&5
-+echo "configure:14133: checking whether writing to stdout works" >&5
++echo "configure:14135: checking whether writing to stdout works" >&5
  if eval "test \"`echo '$''{'ac_cv_write_stdout'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -14116,7 +14140,7 @@
+@@ -14116,7 +14142,7 @@ else
      
  else
    cat > conftest.$ac_ext <<EOF
 -#line 14120 "configure"
-+#line 14144 "configure"
++#line 14146 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_UNISTD_H
-@@ -14134,7 +14158,7 @@
+@@ -14134,7 +14160,7 @@ main()
  }
      
  EOF
 -if { (eval echo configure:14138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:14162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:14164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
        ac_cv_write_stdout=yes
-@@ -14209,12 +14233,12 @@
+@@ -14209,12 +14235,12 @@ test -d /usr/ucblib &&
    unset found
    
    echo $ac_n "checking for socket""... $ac_c" 1>&6
 -echo "configure:14213: checking for socket" >&5
-+echo "configure:14237: checking for socket" >&5
++echo "configure:14239: checking for socket" >&5
  if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 14218 "configure"
-+#line 14242 "configure"
++#line 14244 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char socket(); below.  */
-@@ -14237,7 +14261,7 @@
+@@ -14237,7 +14263,7 @@ socket();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:14241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_socket=yes"
  else
-@@ -14255,12 +14279,12 @@
+@@ -14255,12 +14281,12 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
  else
    echo "$ac_t""no" 1>&6
   echo $ac_n "checking for __socket""... $ac_c" 1>&6
 -echo "configure:14259: checking for __socket" >&5
-+echo "configure:14283: checking for __socket" >&5
++echo "configure:14285: checking for __socket" >&5
  if eval "test \"`echo '$''{'ac_cv_func___socket'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 14264 "configure"
-+#line 14288 "configure"
++#line 14290 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __socket(); below.  */
-@@ -14283,7 +14307,7 @@
+@@ -14283,7 +14309,7 @@ __socket();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:14287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func___socket=yes"
  else
-@@ -14321,7 +14345,7 @@
+@@ -14321,7 +14347,7 @@ EOF
    unset ac_cv_lib_socket___socket
    unset found
    echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
 -echo "configure:14325: checking for socket in -lsocket" >&5
-+echo "configure:14349: checking for socket in -lsocket" >&5
++echo "configure:14351: checking for socket in -lsocket" >&5
  ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -14329,7 +14353,7 @@
+@@ -14329,7 +14355,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 14333 "configure"
-+#line 14357 "configure"
++#line 14359 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -14340,7 +14364,7 @@
+@@ -14340,7 +14366,7 @@ int main() {
  socket()
  ; return 0; }
  EOF
 -if { (eval echo configure:14344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -14360,7 +14384,7 @@
+@@ -14360,7 +14386,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __socket in -lsocket""... $ac_c" 1>&6
 -echo "configure:14364: checking for __socket in -lsocket" >&5
-+echo "configure:14388: checking for __socket in -lsocket" >&5
++echo "configure:14390: checking for __socket in -lsocket" >&5
  ac_lib_var=`echo socket'_'__socket | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -14368,7 +14392,7 @@
+@@ -14368,7 +14394,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 14372 "configure"
-+#line 14396 "configure"
++#line 14398 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -14379,7 +14403,7 @@
+@@ -14379,7 +14405,7 @@ int main() {
  __socket()
  ; return 0; }
  EOF
 -if { (eval echo configure:14383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -14411,11 +14435,11 @@
+@@ -14411,11 +14437,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 14415 "configure"
-+#line 14439 "configure"
++#line 14441 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:14419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:14443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:14445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -14466,12 +14490,12 @@
+@@ -14466,12 +14492,12 @@ EOF
    unset found
    
    echo $ac_n "checking for socketpair""... $ac_c" 1>&6
 -echo "configure:14470: checking for socketpair" >&5
-+echo "configure:14494: checking for socketpair" >&5
++echo "configure:14496: checking for socketpair" >&5
  if eval "test \"`echo '$''{'ac_cv_func_socketpair'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 14475 "configure"
-+#line 14499 "configure"
++#line 14501 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char socketpair(); below.  */
-@@ -14494,7 +14518,7 @@
+@@ -14494,7 +14520,7 @@ socketpair();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:14498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_socketpair=yes"
  else
-@@ -14512,12 +14536,12 @@
+@@ -14512,12 +14538,12 @@ if eval "test \"`echo '$ac_cv_func_'socketpair`\" = yes"; then
  else
    echo "$ac_t""no" 1>&6
   echo $ac_n "checking for __socketpair""... $ac_c" 1>&6
 -echo "configure:14516: checking for __socketpair" >&5
-+echo "configure:14540: checking for __socketpair" >&5
++echo "configure:14542: checking for __socketpair" >&5
  if eval "test \"`echo '$''{'ac_cv_func___socketpair'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 14521 "configure"
-+#line 14545 "configure"
++#line 14547 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __socketpair(); below.  */
-@@ -14540,7 +14564,7 @@
+@@ -14540,7 +14566,7 @@ __socketpair();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:14544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func___socketpair=yes"
  else
-@@ -14578,7 +14602,7 @@
+@@ -14578,7 +14604,7 @@ EOF
    unset ac_cv_lib_socket___socketpair
    unset found
    echo $ac_n "checking for socketpair in -lsocket""... $ac_c" 1>&6
 -echo "configure:14582: checking for socketpair in -lsocket" >&5
-+echo "configure:14606: checking for socketpair in -lsocket" >&5
++echo "configure:14608: checking for socketpair in -lsocket" >&5
  ac_lib_var=`echo socket'_'socketpair | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -14586,7 +14610,7 @@
+@@ -14586,7 +14612,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 14590 "configure"
-+#line 14614 "configure"
++#line 14616 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -14597,7 +14621,7 @@
+@@ -14597,7 +14623,7 @@ int main() {
  socketpair()
  ; return 0; }
  EOF
 -if { (eval echo configure:14601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -14617,7 +14641,7 @@
+@@ -14617,7 +14643,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __socketpair in -lsocket""... $ac_c" 1>&6
 -echo "configure:14621: checking for __socketpair in -lsocket" >&5
-+echo "configure:14645: checking for __socketpair in -lsocket" >&5
++echo "configure:14647: checking for __socketpair in -lsocket" >&5
  ac_lib_var=`echo socket'_'__socketpair | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -14625,7 +14649,7 @@
+@@ -14625,7 +14651,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 14629 "configure"
-+#line 14653 "configure"
++#line 14655 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -14636,7 +14660,7 @@
+@@ -14636,7 +14662,7 @@ int main() {
  __socketpair()
  ; return 0; }
  EOF
 -if { (eval echo configure:14640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -14668,11 +14692,11 @@
+@@ -14668,11 +14694,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 14672 "configure"
-+#line 14696 "configure"
++#line 14698 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:14676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:14700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:14702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -14723,12 +14747,12 @@
+@@ -14723,12 +14749,12 @@ EOF
    unset found
    
    echo $ac_n "checking for htonl""... $ac_c" 1>&6
 -echo "configure:14727: checking for htonl" >&5
-+echo "configure:14751: checking for htonl" >&5
++echo "configure:14753: checking for htonl" >&5
  if eval "test \"`echo '$''{'ac_cv_func_htonl'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 14732 "configure"
-+#line 14756 "configure"
++#line 14758 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char htonl(); below.  */
-@@ -14751,7 +14775,7 @@
+@@ -14751,7 +14777,7 @@ htonl();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:14755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_htonl=yes"
  else
-@@ -14769,12 +14793,12 @@
+@@ -14769,12 +14795,12 @@ if eval "test \"`echo '$ac_cv_func_'htonl`\" = yes"; then
  else
    echo "$ac_t""no" 1>&6
   echo $ac_n "checking for __htonl""... $ac_c" 1>&6
 -echo "configure:14773: checking for __htonl" >&5
-+echo "configure:14797: checking for __htonl" >&5
++echo "configure:14799: checking for __htonl" >&5
  if eval "test \"`echo '$''{'ac_cv_func___htonl'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 14778 "configure"
-+#line 14802 "configure"
++#line 14804 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __htonl(); below.  */
-@@ -14797,7 +14821,7 @@
+@@ -14797,7 +14823,7 @@ __htonl();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:14801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func___htonl=yes"
  else
-@@ -14835,7 +14859,7 @@
+@@ -14835,7 +14861,7 @@ EOF
    unset ac_cv_lib_socket___htonl
    unset found
    echo $ac_n "checking for htonl in -lsocket""... $ac_c" 1>&6
 -echo "configure:14839: checking for htonl in -lsocket" >&5
-+echo "configure:14863: checking for htonl in -lsocket" >&5
++echo "configure:14865: checking for htonl in -lsocket" >&5
  ac_lib_var=`echo socket'_'htonl | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -14843,7 +14867,7 @@
+@@ -14843,7 +14869,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 14847 "configure"
-+#line 14871 "configure"
++#line 14873 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -14854,7 +14878,7 @@
+@@ -14854,7 +14880,7 @@ int main() {
  htonl()
  ; return 0; }
  EOF
 -if { (eval echo configure:14858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -14874,7 +14898,7 @@
+@@ -14874,7 +14900,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __htonl in -lsocket""... $ac_c" 1>&6
 -echo "configure:14878: checking for __htonl in -lsocket" >&5
-+echo "configure:14902: checking for __htonl in -lsocket" >&5
++echo "configure:14904: checking for __htonl in -lsocket" >&5
  ac_lib_var=`echo socket'_'__htonl | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -14882,7 +14906,7 @@
+@@ -14882,7 +14908,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 14886 "configure"
-+#line 14910 "configure"
++#line 14912 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -14893,7 +14917,7 @@
+@@ -14893,7 +14919,7 @@ int main() {
  __htonl()
  ; return 0; }
  EOF
 -if { (eval echo configure:14897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:14921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -14925,11 +14949,11 @@
+@@ -14925,11 +14951,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 14929 "configure"
-+#line 14953 "configure"
++#line 14955 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:14933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:14957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:14959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -14980,12 +15004,12 @@
+@@ -14980,12 +15006,12 @@ EOF
    unset found
    
    echo $ac_n "checking for gethostname""... $ac_c" 1>&6
 -echo "configure:14984: checking for gethostname" >&5
-+echo "configure:15008: checking for gethostname" >&5
++echo "configure:15010: checking for gethostname" >&5
  if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 14989 "configure"
-+#line 15013 "configure"
++#line 15015 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gethostname(); below.  */
-@@ -15008,7 +15032,7 @@
+@@ -15008,7 +15034,7 @@ gethostname();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:15012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_gethostname=yes"
  else
-@@ -15026,12 +15050,12 @@
+@@ -15026,12 +15052,12 @@ if eval "test \"`echo '$ac_cv_func_'gethostname`\" = yes"; then
  else
    echo "$ac_t""no" 1>&6
   echo $ac_n "checking for __gethostname""... $ac_c" 1>&6
 -echo "configure:15030: checking for __gethostname" >&5
-+echo "configure:15054: checking for __gethostname" >&5
++echo "configure:15056: checking for __gethostname" >&5
  if eval "test \"`echo '$''{'ac_cv_func___gethostname'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 15035 "configure"
-+#line 15059 "configure"
++#line 15061 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __gethostname(); below.  */
-@@ -15054,7 +15078,7 @@
+@@ -15054,7 +15080,7 @@ __gethostname();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:15058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func___gethostname=yes"
  else
-@@ -15092,7 +15116,7 @@
+@@ -15092,7 +15118,7 @@ EOF
    unset ac_cv_lib_nsl___gethostname
    unset found
    echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6
 -echo "configure:15096: checking for gethostname in -lnsl" >&5
-+echo "configure:15120: checking for gethostname in -lnsl" >&5
++echo "configure:15122: checking for gethostname in -lnsl" >&5
  ac_lib_var=`echo nsl'_'gethostname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -15100,7 +15124,7 @@
+@@ -15100,7 +15126,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 15104 "configure"
-+#line 15128 "configure"
++#line 15130 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -15111,7 +15135,7 @@
+@@ -15111,7 +15137,7 @@ int main() {
  gethostname()
  ; return 0; }
  EOF
 -if { (eval echo configure:15115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -15131,7 +15155,7 @@
+@@ -15131,7 +15157,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __gethostname in -lnsl""... $ac_c" 1>&6
 -echo "configure:15135: checking for __gethostname in -lnsl" >&5
-+echo "configure:15159: checking for __gethostname in -lnsl" >&5
++echo "configure:15161: checking for __gethostname in -lnsl" >&5
  ac_lib_var=`echo nsl'_'__gethostname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -15139,7 +15163,7 @@
+@@ -15139,7 +15165,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 15143 "configure"
-+#line 15167 "configure"
++#line 15169 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -15150,7 +15174,7 @@
+@@ -15150,7 +15176,7 @@ int main() {
  __gethostname()
  ; return 0; }
  EOF
 -if { (eval echo configure:15154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -15182,11 +15206,11 @@
+@@ -15182,11 +15208,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 15186 "configure"
-+#line 15210 "configure"
++#line 15212 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:15190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:15214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:15216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -15237,12 +15261,12 @@
+@@ -15237,12 +15263,12 @@ EOF
    unset found
    
    echo $ac_n "checking for gethostbyaddr""... $ac_c" 1>&6
 -echo "configure:15241: checking for gethostbyaddr" >&5
-+echo "configure:15265: checking for gethostbyaddr" >&5
++echo "configure:15267: checking for gethostbyaddr" >&5
  if eval "test \"`echo '$''{'ac_cv_func_gethostbyaddr'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 15246 "configure"
-+#line 15270 "configure"
++#line 15272 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gethostbyaddr(); below.  */
-@@ -15265,7 +15289,7 @@
+@@ -15265,7 +15291,7 @@ gethostbyaddr();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:15269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_gethostbyaddr=yes"
  else
-@@ -15283,12 +15307,12 @@
+@@ -15283,12 +15309,12 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyaddr`\" = yes"; then
  else
    echo "$ac_t""no" 1>&6
   echo $ac_n "checking for __gethostbyaddr""... $ac_c" 1>&6
 -echo "configure:15287: checking for __gethostbyaddr" >&5
-+echo "configure:15311: checking for __gethostbyaddr" >&5
++echo "configure:15313: checking for __gethostbyaddr" >&5
  if eval "test \"`echo '$''{'ac_cv_func___gethostbyaddr'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 15292 "configure"
-+#line 15316 "configure"
++#line 15318 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __gethostbyaddr(); below.  */
-@@ -15311,7 +15335,7 @@
+@@ -15311,7 +15337,7 @@ __gethostbyaddr();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:15315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func___gethostbyaddr=yes"
  else
-@@ -15349,7 +15373,7 @@
+@@ -15349,7 +15375,7 @@ EOF
    unset ac_cv_lib_nsl___gethostbyaddr
    unset found
    echo $ac_n "checking for gethostbyaddr in -lnsl""... $ac_c" 1>&6
 -echo "configure:15353: checking for gethostbyaddr in -lnsl" >&5
-+echo "configure:15377: checking for gethostbyaddr in -lnsl" >&5
++echo "configure:15379: checking for gethostbyaddr in -lnsl" >&5
  ac_lib_var=`echo nsl'_'gethostbyaddr | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -15357,7 +15381,7 @@
+@@ -15357,7 +15383,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 15361 "configure"
-+#line 15385 "configure"
++#line 15387 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -15368,7 +15392,7 @@
+@@ -15368,7 +15394,7 @@ int main() {
  gethostbyaddr()
  ; return 0; }
  EOF
 -if { (eval echo configure:15372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -15388,7 +15412,7 @@
+@@ -15388,7 +15414,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __gethostbyaddr in -lnsl""... $ac_c" 1>&6
 -echo "configure:15392: checking for __gethostbyaddr in -lnsl" >&5
-+echo "configure:15416: checking for __gethostbyaddr in -lnsl" >&5
++echo "configure:15418: checking for __gethostbyaddr in -lnsl" >&5
  ac_lib_var=`echo nsl'_'__gethostbyaddr | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -15396,7 +15420,7 @@
+@@ -15396,7 +15422,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 15400 "configure"
-+#line 15424 "configure"
++#line 15426 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -15407,7 +15431,7 @@
+@@ -15407,7 +15433,7 @@ int main() {
  __gethostbyaddr()
  ; return 0; }
  EOF
 -if { (eval echo configure:15411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -15439,11 +15463,11 @@
+@@ -15439,11 +15465,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 15443 "configure"
-+#line 15467 "configure"
++#line 15469 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:15447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:15471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:15473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -15494,12 +15518,12 @@
+@@ -15494,12 +15520,12 @@ EOF
    unset found
    
    echo $ac_n "checking for yp_get_default_domain""... $ac_c" 1>&6
 -echo "configure:15498: checking for yp_get_default_domain" >&5
-+echo "configure:15522: checking for yp_get_default_domain" >&5
++echo "configure:15524: checking for yp_get_default_domain" >&5
  if eval "test \"`echo '$''{'ac_cv_func_yp_get_default_domain'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 15503 "configure"
-+#line 15527 "configure"
++#line 15529 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char yp_get_default_domain(); below.  */
-@@ -15522,7 +15546,7 @@
+@@ -15522,7 +15548,7 @@ yp_get_default_domain();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:15526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_yp_get_default_domain=yes"
  else
-@@ -15540,12 +15564,12 @@
+@@ -15540,12 +15566,12 @@ if eval "test \"`echo '$ac_cv_func_'yp_get_default_domain`\" = yes"; then
  else
    echo "$ac_t""no" 1>&6
   echo $ac_n "checking for __yp_get_default_domain""... $ac_c" 1>&6
 -echo "configure:15544: checking for __yp_get_default_domain" >&5
-+echo "configure:15568: checking for __yp_get_default_domain" >&5
++echo "configure:15570: checking for __yp_get_default_domain" >&5
  if eval "test \"`echo '$''{'ac_cv_func___yp_get_default_domain'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 15549 "configure"
-+#line 15573 "configure"
++#line 15575 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __yp_get_default_domain(); below.  */
-@@ -15568,7 +15592,7 @@
+@@ -15568,7 +15594,7 @@ __yp_get_default_domain();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:15572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func___yp_get_default_domain=yes"
  else
-@@ -15606,7 +15630,7 @@
+@@ -15606,7 +15632,7 @@ EOF
    unset ac_cv_lib_nsl___yp_get_default_domain
    unset found
    echo $ac_n "checking for yp_get_default_domain in -lnsl""... $ac_c" 1>&6
 -echo "configure:15610: checking for yp_get_default_domain in -lnsl" >&5
-+echo "configure:15634: checking for yp_get_default_domain in -lnsl" >&5
++echo "configure:15636: checking for yp_get_default_domain in -lnsl" >&5
  ac_lib_var=`echo nsl'_'yp_get_default_domain | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -15614,7 +15638,7 @@
+@@ -15614,7 +15640,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 15618 "configure"
-+#line 15642 "configure"
++#line 15644 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -15625,7 +15649,7 @@
+@@ -15625,7 +15651,7 @@ int main() {
  yp_get_default_domain()
  ; return 0; }
  EOF
 -if { (eval echo configure:15629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -15645,7 +15669,7 @@
+@@ -15645,7 +15671,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __yp_get_default_domain in -lnsl""... $ac_c" 1>&6
 -echo "configure:15649: checking for __yp_get_default_domain in -lnsl" >&5
-+echo "configure:15673: checking for __yp_get_default_domain in -lnsl" >&5
++echo "configure:15675: checking for __yp_get_default_domain in -lnsl" >&5
  ac_lib_var=`echo nsl'_'__yp_get_default_domain | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -15653,7 +15677,7 @@
+@@ -15653,7 +15679,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 15657 "configure"
-+#line 15681 "configure"
++#line 15683 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -15664,7 +15688,7 @@
+@@ -15664,7 +15690,7 @@ int main() {
  __yp_get_default_domain()
  ; return 0; }
  EOF
 -if { (eval echo configure:15668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -15696,11 +15720,11 @@
+@@ -15696,11 +15722,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 15700 "configure"
-+#line 15724 "configure"
++#line 15726 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:15704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:15728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:15730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -15752,12 +15776,12 @@
+@@ -15752,12 +15778,12 @@ EOF
    unset found
    
    echo $ac_n "checking for dlopen""... $ac_c" 1>&6
 -echo "configure:15756: checking for dlopen" >&5
-+echo "configure:15780: checking for dlopen" >&5
++echo "configure:15782: checking for dlopen" >&5
  if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 15761 "configure"
-+#line 15785 "configure"
++#line 15787 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char dlopen(); below.  */
-@@ -15780,7 +15804,7 @@
+@@ -15780,7 +15806,7 @@ dlopen();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:15784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_dlopen=yes"
  else
-@@ -15798,12 +15822,12 @@
+@@ -15798,12 +15824,12 @@ if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
  else
    echo "$ac_t""no" 1>&6
   echo $ac_n "checking for __dlopen""... $ac_c" 1>&6
 -echo "configure:15802: checking for __dlopen" >&5
-+echo "configure:15826: checking for __dlopen" >&5
++echo "configure:15828: checking for __dlopen" >&5
  if eval "test \"`echo '$''{'ac_cv_func___dlopen'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 15807 "configure"
-+#line 15831 "configure"
++#line 15833 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __dlopen(); below.  */
-@@ -15826,7 +15850,7 @@
+@@ -15826,7 +15852,7 @@ __dlopen();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:15830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func___dlopen=yes"
  else
-@@ -15864,7 +15888,7 @@
+@@ -15864,7 +15890,7 @@ EOF
    unset ac_cv_lib_dl___dlopen
    unset found
    echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
 -echo "configure:15868: checking for dlopen in -ldl" >&5
-+echo "configure:15892: checking for dlopen in -ldl" >&5
++echo "configure:15894: checking for dlopen in -ldl" >&5
  ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -15872,7 +15896,7 @@
+@@ -15872,7 +15898,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 15876 "configure"
-+#line 15900 "configure"
++#line 15902 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -15883,7 +15907,7 @@
+@@ -15883,7 +15909,7 @@ int main() {
  dlopen()
  ; return 0; }
  EOF
 -if { (eval echo configure:15887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -15903,7 +15927,7 @@
+@@ -15903,7 +15929,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __dlopen in -ldl""... $ac_c" 1>&6
 -echo "configure:15907: checking for __dlopen in -ldl" >&5
-+echo "configure:15931: checking for __dlopen in -ldl" >&5
++echo "configure:15933: checking for __dlopen in -ldl" >&5
  ac_lib_var=`echo dl'_'__dlopen | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -15911,7 +15935,7 @@
+@@ -15911,7 +15937,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 15915 "configure"
-+#line 15939 "configure"
++#line 15941 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -15922,7 +15946,7 @@
+@@ -15922,7 +15948,7 @@ int main() {
  __dlopen()
  ; return 0; }
  EOF
 -if { (eval echo configure:15926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:15950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -15954,11 +15978,11 @@
+@@ -15954,11 +15980,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 15958 "configure"
-+#line 15982 "configure"
++#line 15984 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:15962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:15986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:15988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -16010,7 +16034,7 @@
+@@ -16010,7 +16036,7 @@ EOF
  
  fi
  echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
 -echo "configure:16014: checking for sin in -lm" >&5
-+echo "configure:16038: checking for sin in -lm" >&5
++echo "configure:16040: checking for sin in -lm" >&5
  ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -16018,7 +16042,7 @@
+@@ -16018,7 +16044,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lm  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 16022 "configure"
-+#line 16046 "configure"
++#line 16048 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -16029,7 +16053,7 @@
+@@ -16029,7 +16055,7 @@ int main() {
  sin()
  ; return 0; }
  EOF
 -if { (eval echo configure:16033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:16057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -16063,12 +16087,12 @@
+@@ -16063,12 +16089,12 @@ fi
    unset found
    
    echo $ac_n "checking for inet_aton""... $ac_c" 1>&6
 -echo "configure:16067: checking for inet_aton" >&5
-+echo "configure:16091: checking for inet_aton" >&5
++echo "configure:16093: checking for inet_aton" >&5
  if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 16072 "configure"
-+#line 16096 "configure"
++#line 16098 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char inet_aton(); below.  */
-@@ -16091,7 +16115,7 @@
+@@ -16091,7 +16117,7 @@ inet_aton();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:16095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:16119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_inet_aton=yes"
  else
-@@ -16109,12 +16133,12 @@
+@@ -16109,12 +16135,12 @@ if eval "test \"`echo '$ac_cv_func_'inet_aton`\" = yes"; then
  else
    echo "$ac_t""no" 1>&6
   echo $ac_n "checking for __inet_aton""... $ac_c" 1>&6
 -echo "configure:16113: checking for __inet_aton" >&5
-+echo "configure:16137: checking for __inet_aton" >&5
++echo "configure:16139: checking for __inet_aton" >&5
  if eval "test \"`echo '$''{'ac_cv_func___inet_aton'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 16118 "configure"
-+#line 16142 "configure"
++#line 16144 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __inet_aton(); below.  */
-@@ -16137,7 +16161,7 @@
+@@ -16137,7 +16163,7 @@ __inet_aton();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:16141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:16165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func___inet_aton=yes"
  else
-@@ -16175,7 +16199,7 @@
+@@ -16175,7 +16201,7 @@ EOF
    unset ac_cv_lib_resolv___inet_aton
    unset found
    echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6
 -echo "configure:16179: checking for inet_aton in -lresolv" >&5
-+echo "configure:16203: checking for inet_aton in -lresolv" >&5
++echo "configure:16205: checking for inet_aton in -lresolv" >&5
  ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -16183,7 +16207,7 @@
+@@ -16183,7 +16209,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 16187 "configure"
-+#line 16211 "configure"
++#line 16213 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -16194,7 +16218,7 @@
+@@ -16194,7 +16220,7 @@ int main() {
  inet_aton()
  ; return 0; }
  EOF
 -if { (eval echo configure:16198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:16222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -16214,7 +16238,7 @@
+@@ -16214,7 +16240,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __inet_aton in -lresolv""... $ac_c" 1>&6
 -echo "configure:16218: checking for __inet_aton in -lresolv" >&5
-+echo "configure:16242: checking for __inet_aton in -lresolv" >&5
++echo "configure:16244: checking for __inet_aton in -lresolv" >&5
  ac_lib_var=`echo resolv'_'__inet_aton | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -16222,7 +16246,7 @@
+@@ -16222,7 +16248,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 16226 "configure"
-+#line 16250 "configure"
++#line 16252 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -16233,7 +16257,7 @@
+@@ -16233,7 +16259,7 @@ int main() {
  __inet_aton()
  ; return 0; }
  EOF
 -if { (eval echo configure:16237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:16261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -16265,11 +16289,11 @@
+@@ -16265,11 +16291,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 16269 "configure"
-+#line 16293 "configure"
++#line 16295 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:16273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:16297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:16299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -16311,7 +16335,7 @@
+@@ -16311,7 +16337,7 @@ EOF
    unset ac_cv_lib_bind___inet_aton
    unset found
    echo $ac_n "checking for inet_aton in -lbind""... $ac_c" 1>&6
 -echo "configure:16315: checking for inet_aton in -lbind" >&5
-+echo "configure:16339: checking for inet_aton in -lbind" >&5
++echo "configure:16341: checking for inet_aton in -lbind" >&5
  ac_lib_var=`echo bind'_'inet_aton | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -16319,7 +16343,7 @@
+@@ -16319,7 +16345,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 16323 "configure"
-+#line 16347 "configure"
++#line 16349 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -16330,7 +16354,7 @@
+@@ -16330,7 +16356,7 @@ int main() {
  inet_aton()
  ; return 0; }
  EOF
 -if { (eval echo configure:16334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:16358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -16350,7 +16374,7 @@
+@@ -16350,7 +16376,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __inet_aton in -lbind""... $ac_c" 1>&6
 -echo "configure:16354: checking for __inet_aton in -lbind" >&5
-+echo "configure:16378: checking for __inet_aton in -lbind" >&5
++echo "configure:16380: checking for __inet_aton in -lbind" >&5
  ac_lib_var=`echo bind'_'__inet_aton | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -16358,7 +16382,7 @@
+@@ -16358,7 +16384,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 16362 "configure"
-+#line 16386 "configure"
++#line 16388 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -16369,7 +16393,7 @@
+@@ -16369,7 +16395,7 @@ int main() {
  __inet_aton()
  ; return 0; }
  EOF
 -if { (eval echo configure:16373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:16397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -16401,11 +16425,11 @@
+@@ -16401,11 +16427,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 16405 "configure"
-+#line 16429 "configure"
++#line 16431 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:16409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:16433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:16435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -16456,12 +16480,12 @@
+@@ -16456,12 +16482,12 @@ EOF
  
  
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
 -echo "configure:16460: checking for ANSI C header files" >&5
-+echo "configure:16484: checking for ANSI C header files" >&5
++echo "configure:16486: checking for ANSI C header files" >&5
  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 16465 "configure"
-+#line 16489 "configure"
++#line 16491 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -16469,7 +16493,7 @@
+@@ -16469,7 +16495,7 @@ else
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:16473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:16497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:16499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -16486,7 +16510,7 @@
+@@ -16486,7 +16512,7 @@ rm -f conftest*
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
 -#line 16490 "configure"
-+#line 16514 "configure"
++#line 16516 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
-@@ -16504,7 +16528,7 @@
+@@ -16504,7 +16530,7 @@ fi
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
 -#line 16508 "configure"
-+#line 16532 "configure"
++#line 16534 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
-@@ -16525,7 +16549,7 @@
+@@ -16525,7 +16551,7 @@ if test "$cross_compiling" = yes; then
    :
  else
    cat > conftest.$ac_ext <<EOF
 -#line 16529 "configure"
-+#line 16553 "configure"
++#line 16555 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -16536,7 +16560,7 @@
+@@ -16536,7 +16562,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
  exit (0); }
  
  EOF
 -if { (eval echo configure:16540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:16564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:16566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
-@@ -16564,12 +16588,12 @@
+@@ -16564,12 +16590,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
 -echo "configure:16568: checking for $ac_hdr that defines DIR" >&5
-+echo "configure:16592: checking for $ac_hdr that defines DIR" >&5
++echo "configure:16594: checking for $ac_hdr that defines DIR" >&5
  if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 16573 "configure"
-+#line 16597 "configure"
++#line 16599 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <$ac_hdr>
-@@ -16577,7 +16601,7 @@
+@@ -16577,7 +16603,7 @@ int main() {
  DIR *dirp = 0;
  ; return 0; }
  EOF
 -if { (eval echo configure:16581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:16605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    eval "ac_cv_header_dirent_$ac_safe=yes"
  else
-@@ -16602,7 +16626,7 @@
+@@ -16602,7 +16628,7 @@ done
  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
  if test $ac_header_dirent = dirent.h; then
  echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
 -echo "configure:16606: checking for opendir in -ldir" >&5
-+echo "configure:16630: checking for opendir in -ldir" >&5
++echo "configure:16632: checking for opendir in -ldir" >&5
  ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -16610,7 +16634,7 @@
+@@ -16610,7 +16636,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ldir  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 16614 "configure"
-+#line 16638 "configure"
++#line 16640 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -16621,7 +16645,7 @@
+@@ -16621,7 +16647,7 @@ int main() {
  opendir()
  ; return 0; }
  EOF
 -if { (eval echo configure:16625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:16649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -16643,7 +16667,7 @@
+@@ -16643,7 +16669,7 @@ fi
  
  else
  echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
 -echo "configure:16647: checking for opendir in -lx" >&5
-+echo "configure:16671: checking for opendir in -lx" >&5
++echo "configure:16673: checking for opendir in -lx" >&5
  ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -16651,7 +16675,7 @@
+@@ -16651,7 +16677,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lx  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 16655 "configure"
-+#line 16679 "configure"
++#line 16681 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -16662,7 +16686,7 @@
+@@ -16662,7 +16688,7 @@ int main() {
  opendir()
  ; return 0; }
  EOF
 -if { (eval echo configure:16666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:16690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -16744,17 +16768,17 @@
+@@ -16744,17 +16770,17 @@ assert.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:16748: checking for $ac_hdr" >&5
-+echo "configure:16772: checking for $ac_hdr" >&5
++echo "configure:16774: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 16753 "configure"
-+#line 16777 "configure"
++#line 16779 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:16758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:16782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:16784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -16783,12 +16807,12 @@
+@@ -16783,12 +16809,12 @@ done
  
  
    echo $ac_n "checking for fopencookie""... $ac_c" 1>&6
 -echo "configure:16787: checking for fopencookie" >&5
-+echo "configure:16811: checking for fopencookie" >&5
++echo "configure:16813: checking for fopencookie" >&5
  if eval "test \"`echo '$''{'ac_cv_func_fopencookie'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 16792 "configure"
-+#line 16816 "configure"
++#line 16818 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char fopencookie(); below.  */
-@@ -16811,7 +16835,7 @@
+@@ -16811,7 +16837,7 @@ fopencookie();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:16815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:16839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_fopencookie=yes"
  else
-@@ -16833,7 +16857,7 @@
+@@ -16833,7 +16859,7 @@ fi
  
    if test "$have_glibc_fopencookie" = "yes"; then
  cat > conftest.$ac_ext <<EOF
 -#line 16837 "configure"
-+#line 16861 "configure"
++#line 16863 "configure"
  #include "confdefs.h"
  
  #define _GNU_SOURCE
-@@ -16843,7 +16867,7 @@
+@@ -16843,7 +16869,7 @@ int main() {
  cookie_io_functions_t cookie;
  ; return 0; }
  EOF
 -if { (eval echo configure:16847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:16871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    have_cookie_io_functions_t=yes
  else
-@@ -16862,7 +16886,7 @@
+@@ -16862,7 +16888,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 16866 "configure"
-+#line 16890 "configure"
++#line 16892 "configure"
  #include "confdefs.h"
  
  #define _GNU_SOURCE
-@@ -16894,7 +16918,7 @@
+@@ -16894,7 +16920,7 @@ main() {
  
  
  EOF
 -if { (eval echo configure:16898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:16922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:16924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    cookie_io_functions_use_off64_t=yes
-@@ -16914,7 +16938,7 @@
+@@ -16914,7 +16940,7 @@ fi
      else
  
  cat > conftest.$ac_ext <<EOF
 -#line 16918 "configure"
-+#line 16942 "configure"
++#line 16944 "configure"
  #include "confdefs.h"
  
  #define _GNU_SOURCE
-@@ -16924,7 +16948,7 @@
+@@ -16924,7 +16950,7 @@ int main() {
   _IO_cookie_io_functions_t cookie; 
  ; return 0; }
  EOF
 -if { (eval echo configure:16928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:16952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    have_IO_cookie_io_functions_t=yes
  else
-@@ -16958,7 +16982,7 @@
+@@ -16958,7 +16984,7 @@ EOF
  
  
    echo $ac_n "checking for broken getcwd""... $ac_c" 1>&6
 -echo "configure:16962: checking for broken getcwd" >&5
-+echo "configure:16986: checking for broken getcwd" >&5
++echo "configure:16988: checking for broken getcwd" >&5
    os=`uname -sr 2>/dev/null`
    case $os in
      SunOS*)
-@@ -16973,14 +16997,14 @@
+@@ -16973,14 +16999,14 @@ EOF
  
  
    echo $ac_n "checking for broken libc stdio""... $ac_c" 1>&6
 -echo "configure:16977: checking for broken libc stdio" >&5
-+echo "configure:17001: checking for broken libc stdio" >&5
++echo "configure:17003: checking for broken libc stdio" >&5
    if eval "test \"`echo '$''{'_cv_have_broken_glibc_fopen_append'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -2881,118 +2890,118 @@
    if test "$cross_compiling" = yes; then
    cat > conftest.$ac_ext <<EOF
 -#line 16984 "configure"
-+#line 17008 "configure"
++#line 17010 "configure"
  #include "confdefs.h"
  
  #include <features.h>
-@@ -16993,7 +17017,7 @@
+@@ -16993,7 +17019,7 @@ choke me
  
  ; return 0; }
  EOF
 -if { (eval echo configure:16997: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    _cv_have_broken_glibc_fopen_append=yes
  else
-@@ -17006,7 +17030,7 @@
+@@ -17006,7 +17032,7 @@ rm -f conftest*
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17010 "configure"
-+#line 17034 "configure"
++#line 17036 "configure"
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -17034,7 +17058,7 @@
+@@ -17034,7 +17060,7 @@ int main(int argc, char *argv[])
  }
  
  EOF
 -if { (eval echo configure:17038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:17062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    _cv_have_broken_glibc_fopen_append=no
  else
-@@ -17062,12 +17086,12 @@
+@@ -17062,12 +17088,12 @@ EOF
  
  
  echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
 -echo "configure:17066: checking whether struct tm is in sys/time.h or time.h" >&5
-+echo "configure:17090: checking whether struct tm is in sys/time.h or time.h" >&5
++echo "configure:17092: checking whether struct tm is in sys/time.h or time.h" >&5
  if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17071 "configure"
-+#line 17095 "configure"
++#line 17097 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <time.h>
-@@ -17075,7 +17099,7 @@
+@@ -17075,7 +17101,7 @@ int main() {
  struct tm *tp; tp->tm_sec;
  ; return 0; }
  EOF
 -if { (eval echo configure:17079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_tm=time.h
  else
-@@ -17096,12 +17120,12 @@
+@@ -17096,12 +17122,12 @@ EOF
  fi
  
  echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
 -echo "configure:17100: checking for tm_zone in struct tm" >&5
-+echo "configure:17124: checking for tm_zone in struct tm" >&5
++echo "configure:17126: checking for tm_zone in struct tm" >&5
  if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17105 "configure"
-+#line 17129 "configure"
++#line 17131 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <$ac_cv_struct_tm>
-@@ -17109,7 +17133,7 @@
+@@ -17109,7 +17135,7 @@ int main() {
  struct tm tm; tm.tm_zone;
  ; return 0; }
  EOF
 -if { (eval echo configure:17113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_tm_zone=yes
  else
-@@ -17129,12 +17153,12 @@
+@@ -17129,12 +17155,12 @@ EOF
  
  else
    echo $ac_n "checking for tzname""... $ac_c" 1>&6
 -echo "configure:17133: checking for tzname" >&5
-+echo "configure:17157: checking for tzname" >&5
++echo "configure:17159: checking for tzname" >&5
  if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17138 "configure"
-+#line 17162 "configure"
++#line 17164 "configure"
  #include "confdefs.h"
  #include <time.h>
  #ifndef tzname /* For SGI.  */
-@@ -17144,7 +17168,7 @@
+@@ -17144,7 +17170,7 @@ int main() {
  atoi(*tzname);
  ; return 0; }
  EOF
 -if { (eval echo configure:17148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:17172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:17174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_var_tzname=yes
  else
-@@ -17168,16 +17192,16 @@
+@@ -17168,16 +17194,16 @@ fi
  
  
    echo $ac_n "checking for missing declarations of reentrant functions""... $ac_c" 1>&6
 -echo "configure:17172: checking for missing declarations of reentrant functions" >&5
-+echo "configure:17196: checking for missing declarations of reentrant functions" >&5
++echo "configure:17198: checking for missing declarations of reentrant functions" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 17174 "configure"
-+#line 17198 "configure"
++#line 17200 "configure"
  #include "confdefs.h"
  #include <time.h>
  int main() {
@@ -3000,16 +3009,16 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:17181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17207: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      :
-@@ -17195,14 +17219,14 @@
+@@ -17195,14 +17221,14 @@ EOF
  fi
  rm -f conftest*
    cat > conftest.$ac_ext <<EOF
 -#line 17199 "configure"
-+#line 17223 "configure"
++#line 17225 "configure"
  #include "confdefs.h"
  #include <time.h>
  int main() {
@@ -3017,16 +3026,16 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:17206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      :
-@@ -17220,14 +17244,14 @@
+@@ -17220,14 +17246,14 @@ EOF
  fi
  rm -f conftest*
    cat > conftest.$ac_ext <<EOF
 -#line 17224 "configure"
-+#line 17248 "configure"
++#line 17250 "configure"
  #include "confdefs.h"
  #include <time.h>
  int main() {
@@ -3034,16 +3043,16 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:17231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17257: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      :
-@@ -17245,14 +17269,14 @@
+@@ -17245,14 +17271,14 @@ EOF
  fi
  rm -f conftest*
    cat > conftest.$ac_ext <<EOF
 -#line 17249 "configure"
-+#line 17273 "configure"
++#line 17275 "configure"
  #include "confdefs.h"
  #include <time.h>
  int main() {
@@ -3051,16 +3060,16 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:17256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      :
-@@ -17270,14 +17294,14 @@
+@@ -17270,14 +17296,14 @@ EOF
  fi
  rm -f conftest*
    cat > conftest.$ac_ext <<EOF
 -#line 17274 "configure"
-+#line 17298 "configure"
++#line 17300 "configure"
  #include "confdefs.h"
  #include <string.h>
  int main() {
@@ -3068,19 +3077,19 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:17281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      :
-@@ -17298,16 +17322,16 @@
+@@ -17298,16 +17324,16 @@ rm -f conftest*
  
  
    echo $ac_n "checking for fclose declaration""... $ac_c" 1>&6
 -echo "configure:17302: checking for fclose declaration" >&5
-+echo "configure:17326: checking for fclose declaration" >&5
++echo "configure:17328: checking for fclose declaration" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 17304 "configure"
-+#line 17328 "configure"
++#line 17330 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int main() {
@@ -3088,97 +3097,97 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:17311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      cat >> confdefs.h <<\EOF
-@@ -17333,12 +17357,12 @@
+@@ -17333,12 +17359,12 @@ rm -f conftest*
  
  
  echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
 -echo "configure:17337: checking for tm_gmtoff in struct tm" >&5
-+echo "configure:17361: checking for tm_gmtoff in struct tm" >&5
++echo "configure:17363: checking for tm_gmtoff in struct tm" >&5
  if eval "test \"`echo '$''{'ac_cv_struct_tm_gmtoff'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17342 "configure"
-+#line 17366 "configure"
++#line 17368 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <$ac_cv_struct_tm>
-@@ -17346,7 +17370,7 @@
+@@ -17346,7 +17372,7 @@ int main() {
  struct tm tm; tm.tm_gmtoff;
  ; return 0; }
  EOF
 -if { (eval echo configure:17350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_tm_gmtoff=yes
  else
-@@ -17369,12 +17393,12 @@
+@@ -17369,12 +17395,12 @@ fi
  
  
  echo $ac_n "checking for struct flock""... $ac_c" 1>&6
 -echo "configure:17373: checking for struct flock" >&5
-+echo "configure:17397: checking for struct flock" >&5
++echo "configure:17399: checking for struct flock" >&5
  if eval "test \"`echo '$''{'ac_cv_struct_flock'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17378 "configure"
-+#line 17402 "configure"
++#line 17404 "configure"
  #include "confdefs.h"
  
  #include <unistd.h>
-@@ -17384,7 +17408,7 @@
+@@ -17384,7 +17410,7 @@ int main() {
  struct flock x;
  ; return 0; }
  EOF
 -if { (eval echo configure:17388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17412: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
            ac_cv_struct_flock=yes
-@@ -17411,12 +17435,12 @@
+@@ -17411,12 +17437,12 @@ fi
  
  
  echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
 -echo "configure:17415: checking for socklen_t" >&5
-+echo "configure:17439: checking for socklen_t" >&5
++echo "configure:17441: checking for socklen_t" >&5
  if eval "test \"`echo '$''{'ac_cv_socklen_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17420 "configure"
-+#line 17444 "configure"
++#line 17446 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -17428,7 +17452,7 @@
+@@ -17428,7 +17454,7 @@ socklen_t x;
  
  ; return 0; }
  EOF
 -if { (eval echo configure:17432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
    ac_cv_socklen_t=yes
-@@ -17454,7 +17478,7 @@
+@@ -17454,7 +17480,7 @@ fi
  
  
  echo $ac_n "checking size of size_t""... $ac_c" 1>&6
 -echo "configure:17458: checking size of size_t" >&5
-+echo "configure:17482: checking size of size_t" >&5
++echo "configure:17484: checking size of size_t" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_size_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -17462,18 +17486,19 @@
+@@ -17462,18 +17488,19 @@ else
    ac_cv_sizeof_size_t=8
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17466 "configure"
-+#line 17490 "configure"
++#line 17492 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -3194,25 +3203,25 @@
  }
  EOF
 -if { (eval echo configure:17477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:17502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_size_t=`cat conftestval`
  else
-@@ -17493,7 +17518,7 @@
+@@ -17493,7 +17520,7 @@ EOF
  
  
  echo $ac_n "checking size of long long""... $ac_c" 1>&6
 -echo "configure:17497: checking size of long long" >&5
-+echo "configure:17522: checking size of long long" >&5
++echo "configure:17524: checking size of long long" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -17501,18 +17526,19 @@
+@@ -17501,18 +17528,19 @@ else
    ac_cv_sizeof_long_long=8
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17505 "configure"
-+#line 17530 "configure"
++#line 17532 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -3228,25 +3237,25 @@
  }
  EOF
 -if { (eval echo configure:17516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:17542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_long_long=`cat conftestval`
  else
-@@ -17532,7 +17558,7 @@
+@@ -17532,7 +17560,7 @@ EOF
  
  
  echo $ac_n "checking size of long long int""... $ac_c" 1>&6
 -echo "configure:17536: checking size of long long int" >&5
-+echo "configure:17562: checking size of long long int" >&5
++echo "configure:17564: checking size of long long int" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_long_long_int'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -17540,18 +17566,19 @@
+@@ -17540,18 +17568,19 @@ else
    ac_cv_sizeof_long_long_int=8
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17544 "configure"
-+#line 17570 "configure"
++#line 17572 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -3262,25 +3271,25 @@
  }
  EOF
 -if { (eval echo configure:17555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:17582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_long_long_int=`cat conftestval`
  else
-@@ -17571,7 +17598,7 @@
+@@ -17571,7 +17600,7 @@ EOF
  
  
  echo $ac_n "checking size of long""... $ac_c" 1>&6
 -echo "configure:17575: checking size of long" >&5
-+echo "configure:17602: checking size of long" >&5
++echo "configure:17604: checking size of long" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -17579,18 +17606,19 @@
+@@ -17579,18 +17608,19 @@ else
    ac_cv_sizeof_long=8
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17583 "configure"
-+#line 17610 "configure"
++#line 17612 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -3296,25 +3305,25 @@
  }
  EOF
 -if { (eval echo configure:17594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:17622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_long=`cat conftestval`
  else
-@@ -17610,7 +17638,7 @@
+@@ -17610,7 +17640,7 @@ EOF
  
  
  echo $ac_n "checking size of int""... $ac_c" 1>&6
 -echo "configure:17614: checking size of int" >&5
-+echo "configure:17642: checking size of int" >&5
++echo "configure:17644: checking size of int" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -17618,18 +17646,19 @@
+@@ -17618,18 +17648,19 @@ else
    ac_cv_sizeof_int=4
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17622 "configure"
-+#line 17650 "configure"
++#line 17652 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -3330,418 +3339,418 @@
  }
  EOF
 -if { (eval echo configure:17633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:17662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_int=`cat conftestval`
  else
-@@ -17651,7 +17680,7 @@
+@@ -17651,7 +17682,7 @@ EOF
  
  
    echo $ac_n "checking size of intmax_t""... $ac_c" 1>&6
 -echo "configure:17655: checking size of intmax_t" >&5
-+echo "configure:17684: checking size of intmax_t" >&5
++echo "configure:17686: checking size of intmax_t" >&5
    
    php_cache_value=php_cv_sizeof_intmax_t
    if eval "test \"`echo '$''{'php_cv_sizeof_intmax_t'+set}'`\" = set"; then
-@@ -17668,7 +17697,7 @@
+@@ -17668,7 +17699,7 @@ else
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17672 "configure"
-+#line 17701 "configure"
++#line 17703 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  #if STDC_HEADERS
-@@ -17692,7 +17721,7 @@
+@@ -17692,7 +17723,7 @@ int main()
  }
    
  EOF
 -if { (eval echo configure:17696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:17725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      eval $php_cache_value=`cat conftestval`
-@@ -17731,7 +17760,7 @@
+@@ -17731,7 +17762,7 @@ EOF
  
  
    echo $ac_n "checking size of ssize_t""... $ac_c" 1>&6
 -echo "configure:17735: checking size of ssize_t" >&5
-+echo "configure:17764: checking size of ssize_t" >&5
++echo "configure:17766: checking size of ssize_t" >&5
    
    php_cache_value=php_cv_sizeof_ssize_t
    if eval "test \"`echo '$''{'php_cv_sizeof_ssize_t'+set}'`\" = set"; then
-@@ -17748,7 +17777,7 @@
+@@ -17748,7 +17779,7 @@ else
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17752 "configure"
-+#line 17781 "configure"
++#line 17783 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  #if STDC_HEADERS
-@@ -17772,7 +17801,7 @@
+@@ -17772,7 +17803,7 @@ int main()
  }
    
  EOF
 -if { (eval echo configure:17776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:17805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      eval $php_cache_value=`cat conftestval`
-@@ -17811,7 +17840,7 @@
+@@ -17811,7 +17842,7 @@ EOF
  
  
    echo $ac_n "checking size of ptrdiff_t""... $ac_c" 1>&6
 -echo "configure:17815: checking size of ptrdiff_t" >&5
-+echo "configure:17844: checking size of ptrdiff_t" >&5
++echo "configure:17846: checking size of ptrdiff_t" >&5
    
    php_cache_value=php_cv_sizeof_ptrdiff_t
    if eval "test \"`echo '$''{'php_cv_sizeof_ptrdiff_t'+set}'`\" = set"; then
-@@ -17828,7 +17857,7 @@
+@@ -17828,7 +17859,7 @@ else
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17832 "configure"
-+#line 17861 "configure"
++#line 17863 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  #if STDC_HEADERS
-@@ -17852,7 +17881,7 @@
+@@ -17852,7 +17883,7 @@ int main()
  }
    
  EOF
 -if { (eval echo configure:17856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:17885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      eval $php_cache_value=`cat conftestval`
-@@ -17891,12 +17920,12 @@
+@@ -17891,12 +17922,12 @@ EOF
  
  
  echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
 -echo "configure:17895: checking for st_blksize in struct stat" >&5
-+echo "configure:17924: checking for st_blksize in struct stat" >&5
++echo "configure:17926: checking for st_blksize in struct stat" >&5
  if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17900 "configure"
-+#line 17929 "configure"
++#line 17931 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -17904,7 +17933,7 @@
+@@ -17904,7 +17935,7 @@ int main() {
  struct stat s; s.st_blksize;
  ; return 0; }
  EOF
 -if { (eval echo configure:17908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_st_blksize=yes
  else
-@@ -17926,12 +17955,12 @@
+@@ -17926,12 +17957,12 @@ fi
  
  if test "`uname -s 2>/dev/null`" != "QNX"; then
    echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
 -echo "configure:17930: checking for st_blocks in struct stat" >&5
-+echo "configure:17959: checking for st_blocks in struct stat" >&5
++echo "configure:17961: checking for st_blocks in struct stat" >&5
  if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17935 "configure"
-+#line 17964 "configure"
++#line 17966 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -17939,7 +17968,7 @@
+@@ -17939,7 +17970,7 @@ int main() {
  struct stat s; s.st_blocks;
  ; return 0; }
  EOF
 -if { (eval echo configure:17943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:17972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_st_blocks=yes
  else
-@@ -17966,12 +17995,12 @@
+@@ -17966,12 +17997,12 @@ else
    WARNING_LEVEL=0
  fi
  echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
 -echo "configure:17970: checking for st_rdev in struct stat" >&5
-+echo "configure:17999: checking for st_rdev in struct stat" >&5
++echo "configure:18001: checking for st_rdev in struct stat" >&5
  if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17975 "configure"
-+#line 18004 "configure"
++#line 18006 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -17979,7 +18008,7 @@
+@@ -17979,7 +18010,7 @@ int main() {
  struct stat s; s.st_rdev;
  ; return 0; }
  EOF
 -if { (eval echo configure:17983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:18012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:18014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_st_rdev=yes
  else
-@@ -18001,12 +18030,12 @@
+@@ -18001,12 +18032,12 @@ fi
  
  
  echo $ac_n "checking for size_t""... $ac_c" 1>&6
 -echo "configure:18005: checking for size_t" >&5
-+echo "configure:18034: checking for size_t" >&5
++echo "configure:18036: checking for size_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18010 "configure"
-+#line 18039 "configure"
++#line 18041 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -18034,12 +18063,12 @@
+@@ -18034,12 +18065,12 @@ EOF
  fi
  
  echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
 -echo "configure:18038: checking for uid_t in sys/types.h" >&5
-+echo "configure:18067: checking for uid_t in sys/types.h" >&5
++echo "configure:18069: checking for uid_t in sys/types.h" >&5
  if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18043 "configure"
-+#line 18072 "configure"
++#line 18074 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  EOF
-@@ -18070,12 +18099,12 @@
+@@ -18070,12 +18101,12 @@ fi
  
  
      echo $ac_n "checking for struct sockaddr_storage""... $ac_c" 1>&6
 -echo "configure:18074: checking for struct sockaddr_storage" >&5
-+echo "configure:18103: checking for struct sockaddr_storage" >&5
++echo "configure:18105: checking for struct sockaddr_storage" >&5
  if eval "test \"`echo '$''{'ac_cv_sockaddr_storage'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18079 "configure"
-+#line 18108 "configure"
++#line 18110 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/socket.h>
-@@ -18083,7 +18112,7 @@
+@@ -18083,7 +18114,7 @@ int main() {
  struct sockaddr_storage s; s
  ; return 0; }
  EOF
 -if { (eval echo configure:18087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:18116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:18118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_sockaddr_storage=yes
  else
-@@ -18104,13 +18133,13 @@
+@@ -18104,13 +18135,13 @@ EOF
  
    fi
      echo $ac_n "checking for field sa_len in struct sockaddr""... $ac_c" 1>&6
 -echo "configure:18108: checking for field sa_len in struct sockaddr" >&5
-+echo "configure:18137: checking for field sa_len in struct sockaddr" >&5
++echo "configure:18139: checking for field sa_len in struct sockaddr" >&5
  if eval "test \"`echo '$''{'ac_cv_sockaddr_sa_len'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
      cat > conftest.$ac_ext <<EOF
 -#line 18114 "configure"
-+#line 18143 "configure"
++#line 18145 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/socket.h>
-@@ -18118,7 +18147,7 @@
+@@ -18118,7 +18149,7 @@ int main() {
  static struct sockaddr sa; int n = (int) sa.sa_len; return n;
  ; return 0; }
  EOF
 -if { (eval echo configure:18122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:18151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:18153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_sockaddr_sa_len=yes
  else
-@@ -18141,12 +18170,12 @@
+@@ -18141,12 +18172,12 @@ EOF
  
  
  echo $ac_n "checking for IPv6 support""... $ac_c" 1>&6
 -echo "configure:18145: checking for IPv6 support" >&5
-+echo "configure:18174: checking for IPv6 support" >&5
++echo "configure:18176: checking for IPv6 support" >&5
  if eval "test \"`echo '$''{'ac_cv_ipv6_support'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18150 "configure"
-+#line 18179 "configure"
++#line 18181 "configure"
  #include "confdefs.h"
   #include <sys/types.h>
  #include <sys/socket.h>
-@@ -18155,7 +18184,7 @@
+@@ -18155,7 +18186,7 @@ int main() {
  struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0;
  ; return 0; }
  EOF
 -if { (eval echo configure:18159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_ipv6_support=yes
  else
-@@ -18171,12 +18200,12 @@
+@@ -18171,12 +18202,12 @@ echo "$ac_t""$ac_cv_ipv6_support" 1>&6
  
  
  echo $ac_n "checking for vprintf""... $ac_c" 1>&6
 -echo "configure:18175: checking for vprintf" >&5
-+echo "configure:18204: checking for vprintf" >&5
++echo "configure:18206: checking for vprintf" >&5
  if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18180 "configure"
-+#line 18209 "configure"
++#line 18211 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char vprintf(); below.  */
-@@ -18199,7 +18228,7 @@
+@@ -18199,7 +18230,7 @@ vprintf();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:18203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_vprintf=yes"
  else
-@@ -18223,12 +18252,12 @@
+@@ -18223,12 +18254,12 @@ fi
  
  if test "$ac_cv_func_vprintf" != yes; then
  echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
 -echo "configure:18227: checking for _doprnt" >&5
-+echo "configure:18256: checking for _doprnt" >&5
++echo "configure:18258: checking for _doprnt" >&5
  if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18232 "configure"
-+#line 18261 "configure"
++#line 18263 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char _doprnt(); below.  */
-@@ -18251,7 +18280,7 @@
+@@ -18251,7 +18282,7 @@ _doprnt();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:18255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func__doprnt=yes"
  else
-@@ -18359,12 +18388,12 @@
+@@ -18359,12 +18390,12 @@ asprintf \
  
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:18363: checking for $ac_func" >&5
-+echo "configure:18392: checking for $ac_func" >&5
++echo "configure:18394: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18368 "configure"
-+#line 18397 "configure"
++#line 18399 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -18387,7 +18416,7 @@
+@@ -18387,7 +18418,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:18391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -18418,7 +18447,7 @@
+@@ -18418,7 +18449,7 @@ done
    unset ac_cv_lib_rt___nanosleep
    unset found
    echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6
 -echo "configure:18422: checking for nanosleep in -lrt" >&5
-+echo "configure:18451: checking for nanosleep in -lrt" >&5
++echo "configure:18453: checking for nanosleep in -lrt" >&5
  ac_lib_var=`echo rt'_'nanosleep | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -18426,7 +18455,7 @@
+@@ -18426,7 +18457,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lrt  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 18430 "configure"
-+#line 18459 "configure"
++#line 18461 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -18437,7 +18466,7 @@
+@@ -18437,7 +18468,7 @@ int main() {
  nanosleep()
  ; return 0; }
  EOF
 -if { (eval echo configure:18441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -18457,7 +18486,7 @@
+@@ -18457,7 +18488,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __nanosleep in -lrt""... $ac_c" 1>&6
 -echo "configure:18461: checking for __nanosleep in -lrt" >&5
-+echo "configure:18490: checking for __nanosleep in -lrt" >&5
++echo "configure:18492: checking for __nanosleep in -lrt" >&5
  ac_lib_var=`echo rt'_'__nanosleep | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -18465,7 +18494,7 @@
+@@ -18465,7 +18496,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lrt  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 18469 "configure"
-+#line 18498 "configure"
++#line 18500 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -18476,7 +18505,7 @@
+@@ -18476,7 +18507,7 @@ int main() {
  __nanosleep()
  ; return 0; }
  EOF
 -if { (eval echo configure:18480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -18508,11 +18537,11 @@
+@@ -18508,11 +18539,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18512 "configure"
-+#line 18541 "configure"
++#line 18543 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:18516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:18545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -18556,25 +18585,25 @@
+@@ -18556,25 +18587,25 @@ EOF
  
  
  echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6
 -echo "configure:18560: checking for getaddrinfo" >&5
-+echo "configure:18589: checking for getaddrinfo" >&5
++echo "configure:18591: checking for getaddrinfo" >&5
  if eval "test \"`echo '$''{'ac_cv_func_getaddrinfo'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18565 "configure"
-+#line 18594 "configure"
++#line 18596 "configure"
  #include "confdefs.h"
  #include <netdb.h>
  int main() {
@@ -3749,89 +3758,89 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:18572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    if test "$cross_compiling" = yes; then
    ac_cv_func_getaddrinfo=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18578 "configure"
-+#line 18607 "configure"
++#line 18609 "configure"
  #include "confdefs.h"
  
  #include <netdb.h>
-@@ -18614,7 +18643,7 @@
+@@ -18614,7 +18645,7 @@ int main(void) {
  }
    
  EOF
 -if { (eval echo configure:18618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:18647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_getaddrinfo=yes
  else
-@@ -18646,12 +18675,12 @@
+@@ -18646,12 +18677,12 @@ fi
  for ac_func in strlcat strlcpy getopt
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:18650: checking for $ac_func" >&5
-+echo "configure:18679: checking for $ac_func" >&5
++echo "configure:18681: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18655 "configure"
-+#line 18684 "configure"
++#line 18686 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -18674,7 +18703,7 @@
+@@ -18674,7 +18705,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:18678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -18701,7 +18730,7 @@
+@@ -18701,7 +18732,7 @@ done
  
  
  echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6
 -echo "configure:18705: checking whether utime accepts a null argument" >&5
-+echo "configure:18734: checking whether utime accepts a null argument" >&5
++echo "configure:18736: checking whether utime accepts a null argument" >&5
  if eval "test \"`echo '$''{'ac_cv_func_utime_null'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18711,7 +18740,7 @@
+@@ -18711,7 +18742,7 @@ if test "$cross_compiling" = yes; then
    ac_cv_func_utime_null=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18715 "configure"
-+#line 18744 "configure"
++#line 18746 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -18722,7 +18751,7 @@
+@@ -18722,7 +18753,7 @@ exit(!(stat ("conftestdata", &s) == 0 && utime("conftestdata", (long *)0) == 0
  && t.st_mtime - s.st_mtime < 120));
  }
  EOF
 -if { (eval echo configure:18726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:18755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_utime_null=yes
  else
-@@ -18748,19 +18777,19 @@
+@@ -18748,19 +18779,19 @@ fi
  # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
  # for constant arguments.  Useless!
  echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
 -echo "configure:18752: checking for working alloca.h" >&5
-+echo "configure:18781: checking for working alloca.h" >&5
++echo "configure:18783: checking for working alloca.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18757 "configure"
-+#line 18786 "configure"
++#line 18788 "configure"
  #include "confdefs.h"
  #include <alloca.h>
  int main() {
@@ -3839,284 +3848,284 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:18764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_header_alloca_h=yes
  else
-@@ -18781,12 +18810,12 @@
+@@ -18781,12 +18812,12 @@ EOF
  fi
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
 -echo "configure:18785: checking for alloca" >&5
-+echo "configure:18814: checking for alloca" >&5
++echo "configure:18816: checking for alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18790 "configure"
-+#line 18819 "configure"
++#line 18821 "configure"
  #include "confdefs.h"
  
  #ifdef __GNUC__
-@@ -18814,7 +18843,7 @@
+@@ -18814,7 +18845,7 @@ int main() {
  char *p = (char *) alloca(1);
  ; return 0; }
  EOF
 -if { (eval echo configure:18818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_func_alloca_works=yes
  else
-@@ -18846,12 +18875,12 @@
+@@ -18846,12 +18877,12 @@ EOF
  
  
  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
 -echo "configure:18850: checking whether alloca needs Cray hooks" >&5
-+echo "configure:18879: checking whether alloca needs Cray hooks" >&5
++echo "configure:18881: checking whether alloca needs Cray hooks" >&5
  if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18855 "configure"
-+#line 18884 "configure"
++#line 18886 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
  webecray
-@@ -18876,12 +18905,12 @@
+@@ -18876,12 +18907,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
  if test $ac_cv_os_cray = yes; then
  for ac_func in _getb67 GETB67 getb67; do
    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:18880: checking for $ac_func" >&5
-+echo "configure:18909: checking for $ac_func" >&5
++echo "configure:18911: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18885 "configure"
-+#line 18914 "configure"
++#line 18916 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -18904,7 +18933,7 @@
+@@ -18904,7 +18935,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:18908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -18931,7 +18960,7 @@
+@@ -18931,7 +18962,7 @@ done
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
 -echo "configure:18935: checking stack direction for C alloca" >&5
-+echo "configure:18964: checking stack direction for C alloca" >&5
++echo "configure:18966: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18939,7 +18968,7 @@
+@@ -18939,7 +18970,7 @@ else
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18943 "configure"
-+#line 18972 "configure"
++#line 18974 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
-@@ -18958,7 +18987,7 @@
+@@ -18958,7 +18989,7 @@ main ()
    exit (find_stack_direction() < 0);
  }
  EOF
 -if { (eval echo configure:18962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:18991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
  else
-@@ -18981,13 +19010,13 @@
+@@ -18981,13 +19012,13 @@ fi
  
  
    echo $ac_n "checking for declared timezone""... $ac_c" 1>&6
 -echo "configure:18985: checking for declared timezone" >&5
-+echo "configure:19014: checking for declared timezone" >&5
++echo "configure:19016: checking for declared timezone" >&5
  if eval "test \"`echo '$''{'ac_cv_declared_timezone'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
      cat > conftest.$ac_ext <<EOF
 -#line 18991 "configure"
-+#line 19020 "configure"
++#line 19022 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -19002,7 +19031,7 @@
+@@ -19002,7 +19033,7 @@ int main() {
  
  ; return 0; }
  EOF
 -if { (eval echo configure:19006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
    ac_cv_declared_timezone=yes
-@@ -19028,7 +19057,7 @@
+@@ -19028,7 +19059,7 @@ EOF
  
  
  echo $ac_n "checking for type of reentrant time-related functions""... $ac_c" 1>&6
 -echo "configure:19032: checking for type of reentrant time-related functions" >&5
-+echo "configure:19061: checking for type of reentrant time-related functions" >&5
++echo "configure:19063: checking for type of reentrant time-related functions" >&5
  if eval "test \"`echo '$''{'ac_cv_time_r_type'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -19039,7 +19068,7 @@
+@@ -19039,7 +19070,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 19043 "configure"
-+#line 19072 "configure"
++#line 19074 "configure"
  #include "confdefs.h"
  
  #include <time.h>
-@@ -19057,7 +19086,7 @@
+@@ -19057,7 +19088,7 @@ return (1);
  }
  
  EOF
 -if { (eval echo configure:19061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:19090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:19092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    ac_cv_time_r_type=hpux
-@@ -19073,7 +19102,7 @@
+@@ -19073,7 +19104,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 19077 "configure"
-+#line 19106 "configure"
++#line 19108 "configure"
  #include "confdefs.h"
  
  #include <time.h>
-@@ -19089,7 +19118,7 @@
+@@ -19089,7 +19120,7 @@ main() {
  }
    
  EOF
 -if { (eval echo configure:19093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:19122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:19124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      ac_cv_time_r_type=irix
-@@ -19127,12 +19156,12 @@
+@@ -19127,12 +19158,12 @@ EOF
  
  
      echo $ac_n "checking for readdir_r""... $ac_c" 1>&6
 -echo "configure:19131: checking for readdir_r" >&5
-+echo "configure:19160: checking for readdir_r" >&5
++echo "configure:19162: checking for readdir_r" >&5
  if eval "test \"`echo '$''{'ac_cv_func_readdir_r'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 19136 "configure"
-+#line 19165 "configure"
++#line 19167 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char readdir_r(); below.  */
-@@ -19155,7 +19184,7 @@
+@@ -19155,7 +19186,7 @@ readdir_r();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:19159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:19188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:19190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_readdir_r=yes"
  else
-@@ -19177,7 +19206,7 @@
+@@ -19177,7 +19208,7 @@ fi
  
    if test "$ac_cv_func_readdir_r" = "yes"; then
    echo $ac_n "checking for type of readdir_r""... $ac_c" 1>&6
 -echo "configure:19181: checking for type of readdir_r" >&5
-+echo "configure:19210: checking for type of readdir_r" >&5
++echo "configure:19212: checking for type of readdir_r" >&5
  if eval "test \"`echo '$''{'ac_cv_what_readdir_r'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -19188,7 +19217,7 @@
+@@ -19188,7 +19219,7 @@ else
     
  else
    cat > conftest.$ac_ext <<EOF
 -#line 19192 "configure"
-+#line 19221 "configure"
++#line 19223 "configure"
  #include "confdefs.h"
  
  #define _REENTRANT
-@@ -19213,7 +19242,7 @@
+@@ -19213,7 +19244,7 @@ main() {
  }
      
  EOF
 -if { (eval echo configure:19217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:19246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:19248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
        ac_cv_what_readdir_r=POSIX
-@@ -19224,7 +19253,7 @@
+@@ -19224,7 +19255,7 @@ else
    rm -fr conftest*
    
        cat > conftest.$ac_ext <<EOF
 -#line 19228 "configure"
-+#line 19257 "configure"
++#line 19259 "configure"
  #include "confdefs.h"
  
  #define _REENTRANT
-@@ -19234,7 +19263,7 @@
+@@ -19234,7 +19265,7 @@ int readdir_r(DIR *, struct dirent *);
          
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:19238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:19267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:19269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -19276,12 +19305,12 @@
+@@ -19276,12 +19307,12 @@ EOF
  
  
  echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6
 -echo "configure:19280: checking for in_addr_t" >&5
-+echo "configure:19309: checking for in_addr_t" >&5
++echo "configure:19311: checking for in_addr_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_in_addr_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 19285 "configure"
-+#line 19314 "configure"
++#line 19316 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -19315,12 +19344,12 @@
+@@ -19315,12 +19346,12 @@ fi
  for ac_func in crypt_r
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:19319: checking for $ac_func" >&5
-+echo "configure:19348: checking for $ac_func" >&5
++echo "configure:19350: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 19324 "configure"
-+#line 19353 "configure"
++#line 19355 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -19343,7 +19372,7 @@
+@@ -19343,7 +19374,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:19347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:19376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:19378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -19371,14 +19400,14 @@
+@@ -19371,14 +19402,14 @@ done
  if test "x$php_crypt_r" = "x1"; then
    
    echo $ac_n "checking which data struct is used by crypt_r""... $ac_c" 1>&6
 -echo "configure:19375: checking which data struct is used by crypt_r" >&5
-+echo "configure:19404: checking which data struct is used by crypt_r" >&5
++echo "configure:19406: checking which data struct is used by crypt_r" >&5
  if eval "test \"`echo '$''{'php_cv_crypt_r_style'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -4124,250 +4133,250 @@
      php_cv_crypt_r_style=none
      cat > conftest.$ac_ext <<EOF
 -#line 19382 "configure"
-+#line 19411 "configure"
++#line 19413 "configure"
  #include "confdefs.h"
  
  #define _REENTRANT 1
-@@ -19391,7 +19420,7 @@
+@@ -19391,7 +19422,7 @@ crypt_r("passwd", "hash", &buffer);
  
  ; return 0; }
  EOF
 -if { (eval echo configure:19395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    php_cv_crypt_r_style=cryptd
  else
-@@ -19402,7 +19431,7 @@
+@@ -19402,7 +19433,7 @@ rm -f conftest*
  
      if test "$php_cv_crypt_r_style" = "none"; then
        cat > conftest.$ac_ext <<EOF
 -#line 19406 "configure"
-+#line 19435 "configure"
++#line 19437 "configure"
  #include "confdefs.h"
  
  #define _REENTRANT 1
-@@ -19415,7 +19444,7 @@
+@@ -19415,7 +19446,7 @@ crypt_r("passwd", "hash", &buffer);
  
  ; return 0; }
  EOF
 -if { (eval echo configure:19419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    php_cv_crypt_r_style=struct_crypt_data
  else
-@@ -19427,7 +19456,7 @@
+@@ -19427,7 +19458,7 @@ rm -f conftest*
  
      if test "$php_cv_crypt_r_style" = "none"; then
        cat > conftest.$ac_ext <<EOF
 -#line 19431 "configure"
-+#line 19460 "configure"
++#line 19462 "configure"
  #include "confdefs.h"
  
  #define _REENTRANT 1
-@@ -19441,7 +19470,7 @@
+@@ -19441,7 +19472,7 @@ crypt_r("passwd", "hash", &buffer);
  
  ; return 0; }
  EOF
 -if { (eval echo configure:19445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    php_cv_crypt_r_style=struct_crypt_data_gnu_source
  else
-@@ -19500,7 +19529,7 @@
+@@ -19500,7 +19531,7 @@ fi
  php_enable_gcov=no
  
  echo $ac_n "checking whether to include gcov symbols""... $ac_c" 1>&6
 -echo "configure:19504: checking whether to include gcov symbols" >&5
-+echo "configure:19533: checking whether to include gcov symbols" >&5
++echo "configure:19535: checking whether to include gcov symbols" >&5
  # Check whether --enable-gcov or --disable-gcov was given.
  if test "${enable_gcov+set}" = set; then
    enableval="$enable_gcov"
-@@ -19539,7 +19568,7 @@
+@@ -19539,7 +19570,7 @@ if test "$PHP_GCOV" = "yes"; then
    # Extract the first word of "lcov", so it can be a program name with args.
  set dummy lcov; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:19543: checking for $ac_word" >&5
-+echo "configure:19572: checking for $ac_word" >&5
++echo "configure:19574: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_LTP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -19568,7 +19597,7 @@
+@@ -19568,7 +19599,7 @@ fi
    # Extract the first word of "genhtml", so it can be a program name with args.
  set dummy genhtml; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:19572: checking for $ac_word" >&5
-+echo "configure:19601: checking for $ac_word" >&5
++echo "configure:19603: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_LTP_GENHTML'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -19603,7 +19632,7 @@
+@@ -19603,7 +19634,7 @@ fi
  
    if test "$LTP"; then
      echo $ac_n "checking for ltp version""... $ac_c" 1>&6
 -echo "configure:19607: checking for ltp version" >&5
-+echo "configure:19636: checking for ltp version" >&5
++echo "configure:19638: checking for ltp version" >&5
  if eval "test \"`echo '$''{'php_cv_ltp_version'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -19660,7 +19689,7 @@
+@@ -19660,7 +19691,7 @@ fi
  php_enable_debug=no
  
  echo $ac_n "checking whether to include debugging symbols""... $ac_c" 1>&6
 -echo "configure:19664: checking whether to include debugging symbols" >&5
-+echo "configure:19693: checking whether to include debugging symbols" >&5
++echo "configure:19695: checking whether to include debugging symbols" >&5
  # Check whether --enable-debug or --disable-debug was given.
  if test "${enable_debug+set}" = set; then
    enableval="$enable_debug"
-@@ -19708,7 +19737,7 @@
+@@ -19708,7 +19739,7 @@ fi
  php_with_layout=PHP
  
  echo $ac_n "checking layout of installed files""... $ac_c" 1>&6
 -echo "configure:19712: checking layout of installed files" >&5
-+echo "configure:19741: checking layout of installed files" >&5
++echo "configure:19743: checking layout of installed files" >&5
  # Check whether --with-layout or --without-layout was given.
  if test "${with_layout+set}" = set; then
    withval="$with_layout"
-@@ -19740,7 +19769,7 @@
+@@ -19740,7 +19771,7 @@ esac
  php_with_config_file_path=DEFAULT
  
  echo $ac_n "checking path to configuration file""... $ac_c" 1>&6
 -echo "configure:19744: checking path to configuration file" >&5
-+echo "configure:19773: checking path to configuration file" >&5
++echo "configure:19775: checking path to configuration file" >&5
  # Check whether --with-config-file-path or --without-config-file-path was given.
  if test "${with_config_file_path+set}" = set; then
    withval="$with_config_file_path"
-@@ -19771,7 +19800,7 @@
+@@ -19771,7 +19802,7 @@ if test "$PHP_CONFIG_FILE_PATH" = "DEFAULT"; then
  fi
  
  echo $ac_n "checking where to scan for configuration files""... $ac_c" 1>&6
 -echo "configure:19775: checking where to scan for configuration files" >&5
-+echo "configure:19804: checking where to scan for configuration files" >&5
++echo "configure:19806: checking where to scan for configuration files" >&5
  
  php_with_config_file_scan_dir=DEFAULT
  
-@@ -19804,7 +19833,7 @@
+@@ -19804,7 +19835,7 @@ test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
  php_enable_safe_mode=no
  
  echo $ac_n "checking whether to enable safe mode by default""... $ac_c" 1>&6
 -echo "configure:19808: checking whether to enable safe mode by default" >&5
-+echo "configure:19837: checking whether to enable safe mode by default" >&5
++echo "configure:19839: checking whether to enable safe mode by default" >&5
  # Check whether --enable-safe-mode or --disable-safe-mode was given.
  if test "${enable_safe_mode+set}" = set; then
    enableval="$enable_safe_mode"
-@@ -19836,7 +19865,7 @@
+@@ -19836,7 +19867,7 @@ EOF
  fi
  
  echo $ac_n "checking for safe mode exec dir""... $ac_c" 1>&6
 -echo "configure:19840: checking for safe mode exec dir" >&5
-+echo "configure:19869: checking for safe mode exec dir" >&5
++echo "configure:19871: checking for safe mode exec dir" >&5
  
  php_with_exec_dir=no
  
-@@ -19877,7 +19906,7 @@
+@@ -19877,7 +19908,7 @@ fi
  php_enable_sigchild=no
  
  echo $ac_n "checking whether to enable PHP's own SIGCHLD handler""... $ac_c" 1>&6
 -echo "configure:19881: checking whether to enable PHP's own SIGCHLD handler" >&5
-+echo "configure:19910: checking whether to enable PHP's own SIGCHLD handler" >&5
++echo "configure:19912: checking whether to enable PHP's own SIGCHLD handler" >&5
  # Check whether --enable-sigchild or --disable-sigchild was given.
  if test "${enable_sigchild+set}" = set; then
    enableval="$enable_sigchild"
-@@ -19912,7 +19941,7 @@
+@@ -19912,7 +19943,7 @@ fi
  php_enable_magic_quotes=no
  
  echo $ac_n "checking whether to enable magic quotes by default""... $ac_c" 1>&6
 -echo "configure:19916: checking whether to enable magic quotes by default" >&5
-+echo "configure:19945: checking whether to enable magic quotes by default" >&5
++echo "configure:19947: checking whether to enable magic quotes by default" >&5
  # Check whether --enable-magic-quotes or --disable-magic-quotes was given.
  if test "${enable_magic_quotes+set}" = set; then
    enableval="$enable_magic_quotes"
-@@ -19947,7 +19976,7 @@
+@@ -19947,7 +19978,7 @@ fi
  php_enable_libgcc=no
  
  echo $ac_n "checking whether to explicitly link against libgcc""... $ac_c" 1>&6
 -echo "configure:19951: checking whether to explicitly link against libgcc" >&5
-+echo "configure:19980: checking whether to explicitly link against libgcc" >&5
++echo "configure:19982: checking whether to explicitly link against libgcc" >&5
  # Check whether --enable-libgcc or --disable-libgcc was given.
  if test "${enable_libgcc+set}" = set; then
    enableval="$enable_libgcc"
-@@ -20024,7 +20053,7 @@
+@@ -20024,7 +20055,7 @@ fi
  php_enable_short_tags=yes
  
  echo $ac_n "checking whether to enable short tags by default""... $ac_c" 1>&6
 -echo "configure:20028: checking whether to enable short tags by default" >&5
-+echo "configure:20057: checking whether to enable short tags by default" >&5
++echo "configure:20059: checking whether to enable short tags by default" >&5
  # Check whether --enable-short-tags or --disable-short-tags was given.
  if test "${enable_short_tags+set}" = set; then
    enableval="$enable_short_tags"
-@@ -20059,7 +20088,7 @@
+@@ -20059,7 +20090,7 @@ fi
  php_enable_dmalloc=no
  
  echo $ac_n "checking whether to enable dmalloc""... $ac_c" 1>&6
 -echo "configure:20063: checking whether to enable dmalloc" >&5
-+echo "configure:20092: checking whether to enable dmalloc" >&5
++echo "configure:20094: checking whether to enable dmalloc" >&5
  # Check whether --enable-dmalloc or --disable-dmalloc was given.
  if test "${enable_dmalloc+set}" = set; then
    enableval="$enable_dmalloc"
-@@ -20080,7 +20109,7 @@
+@@ -20080,7 +20111,7 @@ echo "$ac_t""$ext_output" 1>&6
  
  if test "$PHP_DMALLOC" = "yes"; then
    echo $ac_n "checking for dmalloc_error in -ldmalloc""... $ac_c" 1>&6
 -echo "configure:20084: checking for dmalloc_error in -ldmalloc" >&5
-+echo "configure:20113: checking for dmalloc_error in -ldmalloc" >&5
++echo "configure:20115: checking for dmalloc_error in -ldmalloc" >&5
  ac_lib_var=`echo dmalloc'_'dmalloc_error | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -20088,7 +20117,7 @@
+@@ -20088,7 +20119,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ldmalloc  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 20092 "configure"
-+#line 20121 "configure"
++#line 20123 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -20099,7 +20128,7 @@
+@@ -20099,7 +20130,7 @@ int main() {
  dmalloc_error()
  ; return 0; }
  EOF
 -if { (eval echo configure:20103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:20132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:20134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -20144,7 +20173,7 @@
+@@ -20144,7 +20175,7 @@ fi
  php_enable_ipv6=yes
  
  echo $ac_n "checking whether to enable IPv6 support""... $ac_c" 1>&6
 -echo "configure:20148: checking whether to enable IPv6 support" >&5
-+echo "configure:20177: checking whether to enable IPv6 support" >&5
++echo "configure:20179: checking whether to enable IPv6 support" >&5
  # Check whether --enable-ipv6 or --disable-ipv6 was given.
  if test "${enable_ipv6+set}" = set; then
    enableval="$enable_ipv6"
-@@ -20171,7 +20200,7 @@
+@@ -20171,7 +20202,7 @@ EOF
  fi
  
  echo $ac_n "checking how big to make fd sets""... $ac_c" 1>&6
 -echo "configure:20175: checking how big to make fd sets" >&5
-+echo "configure:20204: checking how big to make fd sets" >&5
++echo "configure:20206: checking how big to make fd sets" >&5
  
  php_enable_fd_setsize=no
  
-@@ -20239,7 +20268,7 @@
+@@ -20239,7 +20270,7 @@ fi
  
  
  echo $ac_n "checking size of long""... $ac_c" 1>&6
 -echo "configure:20243: checking size of long" >&5
-+echo "configure:20272: checking size of long" >&5
++echo "configure:20274: checking size of long" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -20247,18 +20276,19 @@
+@@ -20247,18 +20278,19 @@ else
    ac_cv_sizeof_long=8
  else
    cat > conftest.$ac_ext <<EOF
 -#line 20251 "configure"
-+#line 20280 "configure"
++#line 20282 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -4383,25 +4392,25 @@
  }
  EOF
 -if { (eval echo configure:20262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:20292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:20294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_long=`cat conftestval`
  else
-@@ -20278,7 +20308,7 @@
+@@ -20278,7 +20310,7 @@ EOF
  
  
  echo $ac_n "checking size of int""... $ac_c" 1>&6
 -echo "configure:20282: checking size of int" >&5
-+echo "configure:20312: checking size of int" >&5
++echo "configure:20314: checking size of int" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -20286,18 +20316,19 @@
+@@ -20286,18 +20318,19 @@ else
    ac_cv_sizeof_int=4
  else
    cat > conftest.$ac_ext <<EOF
 -#line 20290 "configure"
-+#line 20320 "configure"
++#line 20322 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -4417,519 +4426,519 @@
  }
  EOF
 -if { (eval echo configure:20301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:20332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:20334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_int=`cat conftestval`
  else
-@@ -20318,13 +20349,13 @@
+@@ -20318,13 +20351,13 @@ EOF
  
  
  echo $ac_n "checking for int32_t""... $ac_c" 1>&6
 -echo "configure:20322: checking for int32_t" >&5
-+echo "configure:20353: checking for int32_t" >&5
++echo "configure:20355: checking for int32_t" >&5
  if eval "test \"`echo '$''{'ac_cv_int_type_int32_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
  cat > conftest.$ac_ext <<EOF
 -#line 20328 "configure"
-+#line 20359 "configure"
++#line 20361 "configure"
  #include "confdefs.h"
  
  #if HAVE_SYS_TYPES_H
-@@ -20343,7 +20374,7 @@
+@@ -20343,7 +20376,7 @@ if (sizeof (int32_t))
  
  ; return 0; }
  EOF
 -if { (eval echo configure:20347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:20378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:20380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_int_type_int32_t=yes
  else
-@@ -20366,13 +20397,13 @@
+@@ -20366,13 +20399,13 @@ fi
  
  
  echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
 -echo "configure:20370: checking for uint32_t" >&5
-+echo "configure:20401: checking for uint32_t" >&5
++echo "configure:20403: checking for uint32_t" >&5
  if eval "test \"`echo '$''{'ac_cv_int_type_uint32_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
  cat > conftest.$ac_ext <<EOF
 -#line 20376 "configure"
-+#line 20407 "configure"
++#line 20409 "configure"
  #include "confdefs.h"
  
  #if HAVE_SYS_TYPES_H
-@@ -20391,7 +20422,7 @@
+@@ -20391,7 +20424,7 @@ if (sizeof (uint32_t))
  
  ; return 0; }
  EOF
 -if { (eval echo configure:20395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:20426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:20428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_int_type_uint32_t=yes
  else
-@@ -20423,17 +20454,17 @@
+@@ -20423,17 +20456,17 @@ stdlib.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:20427: checking for $ac_hdr" >&5
-+echo "configure:20458: checking for $ac_hdr" >&5
++echo "configure:20460: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 20432 "configure"
-+#line 20463 "configure"
++#line 20465 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:20437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:20468: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:20470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -20463,12 +20494,12 @@
+@@ -20463,12 +20496,12 @@ done
  for ac_func in strtoll atoll strftime
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:20467: checking for $ac_func" >&5
-+echo "configure:20498: checking for $ac_func" >&5
++echo "configure:20500: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 20472 "configure"
-+#line 20503 "configure"
++#line 20505 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -20491,7 +20522,7 @@
+@@ -20491,7 +20524,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:20495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:20526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:20528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -20953,7 +20984,7 @@
+@@ -20953,7 +20986,7 @@ case $PHP_REGEX in
  esac
  
  echo $ac_n "checking which regex library to use""... $ac_c" 1>&6
 -echo "configure:20957: checking which regex library to use" >&5
-+echo "configure:20988: checking which regex library to use" >&5
++echo "configure:20990: checking which regex library to use" >&5
  echo "$ac_t""$REGEX_TYPE" 1>&6
  
  if test "$REGEX_TYPE" = "php"; then
-@@ -21330,13 +21361,13 @@
+@@ -21330,13 +21363,13 @@ elif test "$REGEX_TYPE" = "system"; then
  EOF
  
      echo $ac_n "checking whether field re_magic exists in struct regex_t""... $ac_c" 1>&6
 -echo "configure:21334: checking whether field re_magic exists in struct regex_t" >&5
-+echo "configure:21365: checking whether field re_magic exists in struct regex_t" >&5
++echo "configure:21367: checking whether field re_magic exists in struct regex_t" >&5
  if eval "test \"`echo '$''{'ac_cv_regex_t_re_magic'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
    cat > conftest.$ac_ext <<EOF
 -#line 21340 "configure"
-+#line 21371 "configure"
++#line 21373 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <regex.h>
-@@ -21344,7 +21375,7 @@
+@@ -21344,7 +21377,7 @@ int main() {
  regex_t rt; rt.re_magic;
  ; return 0; }
  EOF
 -if { (eval echo configure:21348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:21379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:21381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_regex_t_re_magic=yes
  else
-@@ -21370,7 +21401,7 @@
+@@ -21370,7 +21403,7 @@ fi
  php_enable_libxml=yes
  
  echo $ac_n "checking whether to enable LIBXML support""... $ac_c" 1>&6
 -echo "configure:21374: checking whether to enable LIBXML support" >&5
-+echo "configure:21405: checking whether to enable LIBXML support" >&5
++echo "configure:21407: checking whether to enable LIBXML support" >&5
  # Check whether --enable-libxml or --disable-libxml was given.
  if test "${enable_libxml+set}" = set; then
    enableval="$enable_libxml"
-@@ -21415,7 +21446,7 @@
+@@ -21415,7 +21448,7 @@ if test -z "$PHP_LIBXML_DIR"; then
  php_with_libxml_dir=no
  
  echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
 -echo "configure:21419: checking libxml2 install dir" >&5
-+echo "configure:21450: checking libxml2 install dir" >&5
++echo "configure:21452: checking libxml2 install dir" >&5
  # Check whether --with-libxml-dir or --without-libxml-dir was given.
  if test "${with_libxml_dir+set}" = set; then
    withval="$with_libxml_dir"
-@@ -21441,7 +21472,7 @@
+@@ -21441,7 +21474,7 @@ if test "$PHP_LIBXML" != "no"; then
  
    
  echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
 -echo "configure:21445: checking for xml2-config path" >&5
-+echo "configure:21476: checking for xml2-config path" >&5
++echo "configure:21478: checking for xml2-config path" >&5
  if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -21599,7 +21630,7 @@
+@@ -21599,7 +21632,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
  
  
              echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
 -echo "configure:21603: checking whether libxml build works" >&5
-+echo "configure:21634: checking whether libxml build works" >&5
++echo "configure:21636: checking whether libxml build works" >&5
  if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -21615,7 +21646,7 @@
+@@ -21615,7 +21648,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 21619 "configure"
-+#line 21650 "configure"
++#line 21652 "configure"
  #include "confdefs.h"
  
      
-@@ -21626,7 +21657,7 @@
+@@ -21626,7 +21659,7 @@ else
      }
    
  EOF
 -if { (eval echo configure:21630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:21661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:21663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      LIBS=$old_LIBS
-@@ -21991,7 +22022,7 @@
+@@ -21991,7 +22024,7 @@ fi
  php_with_openssl=no
  
  echo $ac_n "checking for OpenSSL support""... $ac_c" 1>&6
 -echo "configure:21995: checking for OpenSSL support" >&5
-+echo "configure:22026: checking for OpenSSL support" >&5
++echo "configure:22028: checking for OpenSSL support" >&5
  # Check whether --with-openssl or --without-openssl was given.
  if test "${with_openssl+set}" = set; then
    withval="$with_openssl"
-@@ -22035,7 +22066,7 @@
+@@ -22035,7 +22068,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_with_kerberos=no
  
  echo $ac_n "checking for Kerberos support""... $ac_c" 1>&6
 -echo "configure:22039: checking for Kerberos support" >&5
-+echo "configure:22070: checking for Kerberos support" >&5
++echo "configure:22072: checking for Kerberos support" >&5
  # Check whether --with-kerberos or --without-kerberos was given.
  if test "${with_kerberos+set}" = set; then
    withval="$with_kerberos"
-@@ -22361,7 +22392,7 @@
+@@ -22361,7 +22394,7 @@ EOF
      # Extract the first word of "krb5-config", so it can be a program name with args.
  set dummy krb5-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:22365: checking for $ac_word" >&5
-+echo "configure:22396: checking for $ac_word" >&5
++echo "configure:22398: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -22721,7 +22752,7 @@
+@@ -22721,7 +22754,7 @@ fi
    fi
  
    echo $ac_n "checking for DSA_get_default_method in -lssl""... $ac_c" 1>&6
 -echo "configure:22725: checking for DSA_get_default_method in -lssl" >&5
-+echo "configure:22756: checking for DSA_get_default_method in -lssl" >&5
++echo "configure:22758: checking for DSA_get_default_method in -lssl" >&5
  ac_lib_var=`echo ssl'_'DSA_get_default_method | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -22729,7 +22760,7 @@
+@@ -22729,7 +22762,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lssl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 22733 "configure"
-+#line 22764 "configure"
++#line 22766 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -22740,7 +22771,7 @@
+@@ -22740,7 +22773,7 @@ int main() {
  DSA_get_default_method()
  ; return 0; }
  EOF
 -if { (eval echo configure:22744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:22775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:22777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -22782,7 +22813,7 @@
+@@ -22782,7 +22815,7 @@ fi
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:22786: checking for $ac_word" >&5
-+echo "configure:22817: checking for $ac_word" >&5
++echo "configure:22819: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -22987,9 +23018,9 @@
+@@ -22987,9 +23020,9 @@ fi
      old_CPPFLAGS=$CPPFLAGS
      CPPFLAGS=-I$OPENSSL_INCDIR
      echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
 -echo "configure:22991: checking for OpenSSL version" >&5
-+echo "configure:23022: checking for OpenSSL version" >&5
++echo "configure:23024: checking for OpenSSL version" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 22993 "configure"
-+#line 23024 "configure"
++#line 23026 "configure"
  #include "confdefs.h"
  
  #include <openssl/opensslv.h>
-@@ -23144,7 +23175,7 @@
+@@ -23144,7 +23177,7 @@ rm -f conftest*
    done
  
    echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
 -echo "configure:23148: checking for CRYPTO_free in -lcrypto" >&5
-+echo "configure:23179: checking for CRYPTO_free in -lcrypto" >&5
++echo "configure:23181: checking for CRYPTO_free in -lcrypto" >&5
  ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -23152,7 +23183,7 @@
+@@ -23152,7 +23185,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lcrypto  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 23156 "configure"
-+#line 23187 "configure"
++#line 23189 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -23163,7 +23194,7 @@
+@@ -23163,7 +23196,7 @@ int main() {
  CRYPTO_free()
  ; return 0; }
  EOF
 -if { (eval echo configure:23167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:23198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:23200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -23320,7 +23351,7 @@
+@@ -23320,7 +23353,7 @@ fi
    done
  
    echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
 -echo "configure:23324: checking for SSL_CTX_set_ssl_version in -lssl" >&5
-+echo "configure:23355: checking for SSL_CTX_set_ssl_version in -lssl" >&5
++echo "configure:23357: checking for SSL_CTX_set_ssl_version in -lssl" >&5
  ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -23328,7 +23359,7 @@
+@@ -23328,7 +23361,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lssl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 23332 "configure"
-+#line 23363 "configure"
++#line 23365 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -23339,7 +23370,7 @@
+@@ -23339,7 +23372,7 @@ int main() {
  SSL_CTX_set_ssl_version()
  ; return 0; }
  EOF
 -if { (eval echo configure:23343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:23374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:23376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -23481,7 +23512,7 @@
+@@ -23481,7 +23514,7 @@ ext_output=$PHP_PCRE_REGEX
  
    if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then
      echo $ac_n "checking for PCRE headers location""... $ac_c" 1>&6
 -echo "configure:23485: checking for PCRE headers location" >&5
-+echo "configure:23516: checking for PCRE headers location" >&5
++echo "configure:23518: checking for PCRE headers location" >&5
      for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre $PHP_PCRE_REGEX/local/include; do
        test -f $i/pcre.h && PCRE_INCDIR=$i
      done
-@@ -23492,7 +23523,7 @@
+@@ -23492,7 +23525,7 @@ echo "configure:23485: checking for PCRE headers location" >&5
      echo "$ac_t""$PCRE_INCDIR" 1>&6
  
      echo $ac_n "checking for PCRE library location""... $ac_c" 1>&6
 -echo "configure:23496: checking for PCRE library location" >&5
-+echo "configure:23527: checking for PCRE library location" >&5
++echo "configure:23529: checking for PCRE library location" >&5
      for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do
        test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j
      done
-@@ -23914,7 +23945,7 @@
+@@ -23914,7 +23947,7 @@ EOF
  
    else
      echo $ac_n "checking for PCRE library to use""... $ac_c" 1>&6
 -echo "configure:23918: checking for PCRE library to use" >&5
-+echo "configure:23949: checking for PCRE library to use" >&5
++echo "configure:23951: checking for PCRE library to use" >&5
      echo "$ac_t""bundled" 1>&6
      pcrelib_sources="pcrelib/pcre_chartables.c pcrelib/pcre_ucd.c \
                                 pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_exec.c \
-@@ -24251,7 +24282,7 @@
+@@ -24251,7 +24284,7 @@ EOF
  php_with_sqlite3=yes
  
  echo $ac_n "checking whether to enable the SQLite3 extension""... $ac_c" 1>&6
 -echo "configure:24255: checking whether to enable the SQLite3 extension" >&5
-+echo "configure:24286: checking whether to enable the SQLite3 extension" >&5
++echo "configure:24288: checking whether to enable the SQLite3 extension" >&5
  # Check whether --with-sqlite3 or --without-sqlite3 was given.
  if test "${with_sqlite3+set}" = set; then
    withval="$with_sqlite3"
-@@ -24306,7 +24337,7 @@
+@@ -24306,7 +24339,7 @@ if test $PHP_SQLITE3 != "no"; then
  
    if test $PHP_SQLITE3 != "yes"; then
      echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6
 -echo "configure:24310: checking for sqlite3 files in default path" >&5
-+echo "configure:24341: checking for sqlite3 files in default path" >&5
++echo "configure:24343: checking for sqlite3 files in default path" >&5
      for i in $PHP_SQLITE3 /usr/local /usr; do
        if test -r $i/include/sqlite3.h; then
          SQLITE3_DIR=$i
-@@ -24321,7 +24352,7 @@
+@@ -24321,7 +24354,7 @@ echo "configure:24310: checking for sqlite3 files in default path" >&5
      fi
  
      echo $ac_n "checking for SQLite 3.3.9+""... $ac_c" 1>&6
 -echo "configure:24325: checking for SQLite 3.3.9+" >&5
-+echo "configure:24356: checking for SQLite 3.3.9+" >&5
++echo "configure:24358: checking for SQLite 3.3.9+" >&5
      
    save_old_LDFLAGS=$LDFLAGS
    ac_stuff="
-@@ -24420,7 +24451,7 @@
+@@ -24420,7 +24453,7 @@ echo "configure:24325: checking for SQLite 3.3.9+" >&5
    done
  
    echo $ac_n "checking for sqlite3_prepare_v2 in -lsqlite3""... $ac_c" 1>&6
 -echo "configure:24424: checking for sqlite3_prepare_v2 in -lsqlite3" >&5
-+echo "configure:24455: checking for sqlite3_prepare_v2 in -lsqlite3" >&5
++echo "configure:24457: checking for sqlite3_prepare_v2 in -lsqlite3" >&5
  ac_lib_var=`echo sqlite3'_'sqlite3_prepare_v2 | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -24428,7 +24459,7 @@
+@@ -24428,7 +24461,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsqlite3  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 24432 "configure"
-+#line 24463 "configure"
++#line 24465 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -24439,7 +24470,7 @@
+@@ -24439,7 +24472,7 @@ int main() {
  sqlite3_prepare_v2()
  ; return 0; }
  EOF
 -if { (eval echo configure:24443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:24474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:24476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -24699,7 +24730,7 @@
+@@ -24699,7 +24732,7 @@ fi
    done
  
    echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6
 -echo "configure:24703: checking for sqlite3_key in -lsqlite3" >&5
-+echo "configure:24734: checking for sqlite3_key in -lsqlite3" >&5
++echo "configure:24736: checking for sqlite3_key in -lsqlite3" >&5
  ac_lib_var=`echo sqlite3'_'sqlite3_key | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -24707,7 +24738,7 @@
+@@ -24707,7 +24740,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsqlite3  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 24711 "configure"
-+#line 24742 "configure"
++#line 24744 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -24718,7 +24749,7 @@
+@@ -24718,7 +24751,7 @@ int main() {
  sqlite3_key()
  ; return 0; }
  EOF
 -if { (eval echo configure:24722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:24753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:24755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -24850,7 +24881,7 @@
+@@ -24850,7 +24883,7 @@ fi
    done
  
    echo $ac_n "checking for sqlite3_load_extension in -lsqlite3""... $ac_c" 1>&6
 -echo "configure:24854: checking for sqlite3_load_extension in -lsqlite3" >&5
-+echo "configure:24885: checking for sqlite3_load_extension in -lsqlite3" >&5
++echo "configure:24887: checking for sqlite3_load_extension in -lsqlite3" >&5
  ac_lib_var=`echo sqlite3'_'sqlite3_load_extension | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -24858,7 +24889,7 @@
+@@ -24858,7 +24891,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsqlite3  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 24862 "configure"
-+#line 24893 "configure"
++#line 24895 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -24869,7 +24900,7 @@
+@@ -24869,7 +24902,7 @@ int main() {
  sqlite3_load_extension()
  ; return 0; }
  EOF
 -if { (eval echo configure:24873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:24904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:24906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -24906,7 +24937,7 @@
+@@ -24906,7 +24939,7 @@ fi
  
    else
      echo $ac_n "checking bundled sqlite3 library""... $ac_c" 1>&6
 -echo "configure:24910: checking bundled sqlite3 library" >&5
-+echo "configure:24941: checking bundled sqlite3 library" >&5
++echo "configure:24943: checking bundled sqlite3 library" >&5
      echo "$ac_t""yes" 1>&6
  
      sqlite3_extra_sources="libsqlite/sqlite3.c"
-@@ -25262,7 +25293,7 @@
+@@ -25262,7 +25295,7 @@ fi
  php_with_zlib=no
  
  echo $ac_n "checking for ZLIB support""... $ac_c" 1>&6
 -echo "configure:25266: checking for ZLIB support" >&5
-+echo "configure:25297: checking for ZLIB support" >&5
++echo "configure:25299: checking for ZLIB support" >&5
  # Check whether --with-zlib or --without-zlib was given.
  if test "${with_zlib+set}" = set; then
    withval="$with_zlib"
-@@ -25306,7 +25337,7 @@
+@@ -25306,7 +25339,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_with_zlib_dir=no
  
  echo $ac_n "checking if the location of ZLIB install directory is defined""... $ac_c" 1>&6
 -echo "configure:25310: checking if the location of ZLIB install directory is defined" >&5
-+echo "configure:25341: checking if the location of ZLIB install directory is defined" >&5
++echo "configure:25343: checking if the location of ZLIB install directory is defined" >&5
  # Check whether --with-zlib-dir or --without-zlib-dir was given.
  if test "${with_zlib_dir+set}" = set; then
    withval="$with_zlib_dir"
-@@ -25749,7 +25780,7 @@
+@@ -25749,7 +25782,7 @@ EOF
    done
  
    echo $ac_n "checking for gzgets in -lz""... $ac_c" 1>&6
 -echo "configure:25753: checking for gzgets in -lz" >&5
-+echo "configure:25784: checking for gzgets in -lz" >&5
++echo "configure:25786: checking for gzgets in -lz" >&5
  ac_lib_var=`echo z'_'gzgets | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -25757,7 +25788,7 @@
+@@ -25757,7 +25790,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lz  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 25761 "configure"
-+#line 25792 "configure"
++#line 25794 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -25768,7 +25799,7 @@
+@@ -25768,7 +25801,7 @@ int main() {
  gzgets()
  ; return 0; }
  EOF
 -if { (eval echo configure:25772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:25803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:25805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -25905,10 +25936,999 @@
+@@ -25905,10 +25938,999 @@ fi
  
  
  
 +php_enable_apc=no
 +
 +echo $ac_n "checking whether to enable APC support""... $ac_c" 1>&6
-+echo "configure:25943: checking whether to enable APC support" >&5
++echo "configure:25945: checking whether to enable APC support" >&5
 +# Check whether --enable-apc or --disable-apc was given.
 +if test "${enable_apc+set}" = set; then
 +  enableval="$enable_apc"
@@ -4983,7 +4992,7 @@
 +
 +
 +echo $ac_n "checking whether we should enable cache request file info""... $ac_c" 1>&6
-+echo "configure:25997: checking whether we should enable cache request file info" >&5
++echo "configure:25999: checking whether we should enable cache request file info" >&5
 +# Check whether --enable-apc-filehits or --disable-apc-filehits was given.
 +if test "${enable_apc_filehits+set}" = set; then
 +  enableval="$enable_apc_filehits"
@@ -5000,7 +5009,7 @@
 +
 +
 +echo $ac_n "checking whether we should use mmap""... $ac_c" 1>&6
-+echo "configure:26014: checking whether we should use mmap" >&5
++echo "configure:26016: checking whether we should use mmap" >&5
 +# Check whether --enable-apc-mmap or --disable-apc-mmap was given.
 +if test "${enable_apc_mmap+set}" = set; then
 +  enableval="$enable_apc_mmap"
@@ -5017,7 +5026,7 @@
 +
 +
 +echo $ac_n "checking whether we should use semaphore locking instead of fcntl""... $ac_c" 1>&6
-+echo "configure:26031: checking whether we should use semaphore locking instead of fcntl" >&5
++echo "configure:26033: checking whether we should use semaphore locking instead of fcntl" >&5
 +# Check whether --enable-apc-sem or --disable-apc-sem was given.
 +if test "${enable_apc_sem+set}" = set; then
 +  enableval="$enable_apc_sem"
@@ -5034,7 +5043,7 @@
 +
 +
 +echo $ac_n "checking whether we should use pthread mutex locking""... $ac_c" 1>&6
-+echo "configure:26048: checking whether we should use pthread mutex locking" >&5
++echo "configure:26050: checking whether we should use pthread mutex locking" >&5
 +# Check whether --enable-apc-pthreadmutex or --disable-apc-pthreadmutex was given.
 +if test "${enable_apc_pthreadmutex+set}" = set; then
 +  enableval="$enable_apc_pthreadmutex"
@@ -5069,7 +5078,7 @@
 +      
 +else
 +  cat > conftest.$ac_ext <<EOF
-+#line 26083 "configure"
++#line 26085 "configure"
 +#include "confdefs.h"
 +
 +                              #include <sys/types.h>
@@ -5104,7 +5113,7 @@
 +                                }
 +                      
 +EOF
-+if { (eval echo configure:26118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:26120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 +then
 +                              
 +  
@@ -5132,7 +5141,7 @@
 +fi
 +
 +echo $ac_n "checking whether we should use spin locks""... $ac_c" 1>&6
-+echo "configure:26146: checking whether we should use spin locks" >&5
++echo "configure:26148: checking whether we should use spin locks" >&5
 +# Check whether --enable-apc-spinlocks or --disable-apc-spinlocks was given.
 +if test "${enable_apc_spinlocks+set}" = set; then
 +  enableval="$enable_apc_spinlocks"
@@ -5149,7 +5158,7 @@
 +
 +
 +echo $ac_n "checking whether we should enable memory protection""... $ac_c" 1>&6
-+echo "configure:26163: checking whether we should enable memory protection" >&5
++echo "configure:26165: checking whether we should enable memory protection" >&5
 +# Check whether --enable-apc-memprotect or --disable-apc-memprotect was given.
 +if test "${enable_apc_memprotect+set}" = set; then
 +  enableval="$enable_apc_memprotect"
@@ -5212,7 +5221,7 @@
 +      fi
 +
 +  echo $ac_n "checking for zend_set_lookup_function_hook""... $ac_c" 1>&6
-+echo "configure:26226: checking for zend_set_lookup_function_hook" >&5
++echo "configure:26228: checking for zend_set_lookup_function_hook" >&5
 +if eval "test \"`echo '$''{'php_cv_zend_set_lookup_function_hook'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
 +else
@@ -5220,7 +5229,7 @@
 +    orig_cflags=$CFLAGS
 +    CFLAGS="$INCLUDES $EXTRA_INCLUDES"
 +    cat > conftest.$ac_ext <<EOF
-+#line 26234 "configure"
++#line 26236 "configure"
 +#include "confdefs.h"
 +
 +#include "main/php.h"
@@ -5232,7 +5241,7 @@
 +#endif
 +; return 0; }
 +EOF
-+if { (eval echo configure:26246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:26248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 +  rm -rf conftest*
 +  
 +      php_cv_zend_set_lookup_function_hook=yes
@@ -5266,12 +5275,12 @@
 +  for ac_func in sigaction
 +do
 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:26280: checking for $ac_func" >&5
++echo "configure:26282: checking for $ac_func" >&5
 +if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
 +else
 +  cat > conftest.$ac_ext <<EOF
-+#line 26285 "configure"
++#line 26287 "configure"
 +#include "confdefs.h"
 +/* System header to define __stub macros and hopefully few prototypes,
 +    which can conflict with char $ac_func(); below.  */
@@ -5294,7 +5303,7 @@
 +
 +; return 0; }
 +EOF
-+if { (eval echo configure:26308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:26310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 +  rm -rf conftest*
 +  eval "ac_cv_func_$ac_func=yes"
 +else
@@ -5319,13 +5328,13 @@
 +done
 +
 +  echo $ac_n "checking for union semun""... $ac_c" 1>&6
-+echo "configure:26333: checking for union semun" >&5
++echo "configure:26335: checking for union semun" >&5
 +if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
 +else
 +  
 +    cat > conftest.$ac_ext <<EOF
-+#line 26339 "configure"
++#line 26341 "configure"
 +#include "confdefs.h"
 +
 +#include <sys/types.h>
@@ -5336,7 +5345,7 @@
 +union semun x; x.val=1
 +; return 0; }
 +EOF
-+if { (eval echo configure:26350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:26352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 +  rm -rf conftest*
 +  
 +      php_cv_semun=yes
@@ -5367,7 +5376,7 @@
 +  fi
 +
 +  echo $ac_n "checking whether we should enable valgrind support""... $ac_c" 1>&6
-+echo "configure:26381: checking whether we should enable valgrind support" >&5
++echo "configure:26383: checking whether we should enable valgrind support" >&5
 +  # Check whether --enable-valgrind-checks or --disable-valgrind-checks was given.
 +if test "${enable_valgrind_checks+set}" = set; then
 +  enableval="$enable_valgrind_checks"
@@ -5381,17 +5390,17 @@
 +    echo "$ac_t""yes" 1>&6
 +    ac_safe=`echo "valgrind/memcheck.h" | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for valgrind/memcheck.h""... $ac_c" 1>&6
-+echo "configure:26395: checking for valgrind/memcheck.h" >&5
++echo "configure:26397: checking for valgrind/memcheck.h" >&5
 +if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
 +else
 +  cat > conftest.$ac_ext <<EOF
-+#line 26400 "configure"
++#line 26402 "configure"
 +#include "confdefs.h"
 +#include <valgrind/memcheck.h>
 +EOF
 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:26405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:26407: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 +if test -z "$ac_err"; then
 +  rm -rf conftest*
@@ -5537,7 +5546,7 @@
 +  done
 +
 +  echo $ac_n "checking for shm_open in -lrt""... $ac_c" 1>&6
-+echo "configure:26551: checking for shm_open in -lrt" >&5
++echo "configure:26553: checking for shm_open in -lrt" >&5
 +ac_lib_var=`echo rt'_'shm_open | sed 'y%./+-%__p_%'`
 +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
 +  echo $ac_n "(cached) $ac_c" 1>&6
@@ -5545,7 +5554,7 @@
 +  ac_save_LIBS="$LIBS"
 +LIBS="-lrt  $LIBS"
 +cat > conftest.$ac_ext <<EOF
-+#line 26559 "configure"
++#line 26561 "configure"
 +#include "confdefs.h"
 +/* Override any gcc2 internal prototype to avoid an error.  */
 +/* We use char because int might match the return type of a gcc2
@@ -5556,7 +5565,7 @@
 +shm_open()
 +; return 0; }
 +EOF
-+if { (eval echo configure:26570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:26572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 +  rm -rf conftest*
 +  eval "ac_cv_lib_$ac_lib_var=yes"
 +else
@@ -5919,181 +5928,181 @@
  
  echo $ac_n "checking whether to enable bc style precision math functions""... $ac_c" 1>&6
 -echo "configure:25912: checking whether to enable bc style precision math functions" >&5
-+echo "configure:26932: checking whether to enable bc style precision math functions" >&5
++echo "configure:26934: checking whether to enable bc style precision math functions" >&5
  # Check whether --enable-bcmath or --disable-bcmath was given.
  if test "${enable_bcmath+set}" = set; then
    enableval="$enable_bcmath"
-@@ -26273,7 +27293,7 @@
+@@ -26273,7 +27295,7 @@ fi
  php_with_bz2=no
  
  echo $ac_n "checking for BZip2 support""... $ac_c" 1>&6
 -echo "configure:26277: checking for BZip2 support" >&5
-+echo "configure:27297: checking for BZip2 support" >&5
++echo "configure:27299: checking for BZip2 support" >&5
  # Check whether --with-bz2 or --without-bz2 was given.
  if test "${with_bz2+set}" = set; then
    withval="$with_bz2"
-@@ -26318,7 +27338,7 @@
+@@ -26318,7 +27340,7 @@ if test "$PHP_BZ2" != "no"; then
      BZIP_DIR=$PHP_BZ2
    else
      echo $ac_n "checking for BZip2 in default path""... $ac_c" 1>&6
 -echo "configure:26322: checking for BZip2 in default path" >&5
-+echo "configure:27342: checking for BZip2 in default path" >&5
++echo "configure:27344: checking for BZip2 in default path" >&5
      for i in /usr/local /usr; do
        if test -r $i/include/bzlib.h; then
          BZIP_DIR=$i
-@@ -26431,7 +27451,7 @@
+@@ -26431,7 +27453,7 @@ echo "configure:26322: checking for BZip2 in default path" >&5
    done
  
    echo $ac_n "checking for BZ2_bzerror in -lbz2""... $ac_c" 1>&6
 -echo "configure:26435: checking for BZ2_bzerror in -lbz2" >&5
-+echo "configure:27455: checking for BZ2_bzerror in -lbz2" >&5
++echo "configure:27457: checking for BZ2_bzerror in -lbz2" >&5
  ac_lib_var=`echo bz2'_'BZ2_bzerror | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -26439,7 +27459,7 @@
+@@ -26439,7 +27461,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbz2  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 26443 "configure"
-+#line 27463 "configure"
++#line 27465 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -26450,7 +27470,7 @@
+@@ -26450,7 +27472,7 @@ int main() {
  BZ2_bzerror()
  ; return 0; }
  EOF
 -if { (eval echo configure:26454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:27474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:27476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -26918,7 +27938,7 @@
+@@ -26918,7 +27940,7 @@ fi
  php_enable_calendar=no
  
  echo $ac_n "checking whether to enable calendar conversion support""... $ac_c" 1>&6
 -echo "configure:26922: checking whether to enable calendar conversion support" >&5
-+echo "configure:27942: checking whether to enable calendar conversion support" >&5
++echo "configure:27944: checking whether to enable calendar conversion support" >&5
  # Check whether --enable-calendar or --disable-calendar was given.
  if test "${enable_calendar+set}" = set; then
    enableval="$enable_calendar"
-@@ -27262,7 +28282,7 @@
+@@ -27262,7 +28284,7 @@ fi
  php_enable_ctype=yes
  
  echo $ac_n "checking whether to enable ctype functions""... $ac_c" 1>&6
 -echo "configure:27266: checking whether to enable ctype functions" >&5
-+echo "configure:28286: checking whether to enable ctype functions" >&5
++echo "configure:28288: checking whether to enable ctype functions" >&5
  # Check whether --enable-ctype or --disable-ctype was given.
  if test "${enable_ctype+set}" = set; then
    enableval="$enable_ctype"
-@@ -27606,7 +28626,7 @@
+@@ -27606,7 +28628,7 @@ fi
  php_with_curl=no
  
  echo $ac_n "checking for cURL support""... $ac_c" 1>&6
 -echo "configure:27610: checking for cURL support" >&5
-+echo "configure:28630: checking for cURL support" >&5
++echo "configure:28632: checking for cURL support" >&5
  # Check whether --with-curl or --without-curl was given.
  if test "${with_curl+set}" = set; then
    withval="$with_curl"
-@@ -27650,7 +28670,7 @@
+@@ -27650,7 +28672,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_with_curlwrappers=no
  
  echo $ac_n "checking if we should use cURL for url streams""... $ac_c" 1>&6
 -echo "configure:27654: checking if we should use cURL for url streams" >&5
-+echo "configure:28674: checking if we should use cURL for url streams" >&5
++echo "configure:28676: checking if we should use cURL for url streams" >&5
  # Check whether --with-curlwrappers or --without-curlwrappers was given.
  if test "${with_curlwrappers+set}" = set; then
    withval="$with_curlwrappers"
-@@ -27674,7 +28694,7 @@
+@@ -27674,7 +28696,7 @@ if test "$PHP_CURL" != "no"; then
      CURL_DIR=$PHP_CURL
    else
      echo $ac_n "checking for cURL in default path""... $ac_c" 1>&6
 -echo "configure:27678: checking for cURL in default path" >&5
-+echo "configure:28698: checking for cURL in default path" >&5
++echo "configure:28700: checking for cURL in default path" >&5
      for i in /usr/local /usr; do
        if test -r $i/include/curl/easy.h; then
          CURL_DIR=$i
-@@ -27692,7 +28712,7 @@
+@@ -27692,7 +28714,7 @@ echo "configure:27678: checking for cURL in default path" >&5
  
    CURL_CONFIG="curl-config"
    echo $ac_n "checking for cURL 7.10.5 or greater""... $ac_c" 1>&6
 -echo "configure:27696: checking for cURL 7.10.5 or greater" >&5
-+echo "configure:28716: checking for cURL 7.10.5 or greater" >&5
++echo "configure:28718: checking for cURL 7.10.5 or greater" >&5
  
    if ${CURL_DIR}/bin/curl-config --libs > /dev/null 2>&1; then
      CURL_CONFIG=${CURL_DIR}/bin/curl-config
-@@ -27930,7 +28950,7 @@
+@@ -27930,7 +28952,7 @@ echo "configure:27696: checking for cURL 7.10.5 or greater" >&5
  
    
    echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6
 -echo "configure:27934: checking for SSL support in libcurl" >&5
-+echo "configure:28954: checking for SSL support in libcurl" >&5
++echo "configure:28956: checking for SSL support in libcurl" >&5
    CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL`
    if test "$CURL_SSL" = "SSL"; then
      echo "$ac_t""yes" 1>&6
-@@ -27943,7 +28963,7 @@
+@@ -27943,7 +28965,7 @@ EOF
      CFLAGS="`$CURL_CONFIG --cflags`"
     
      echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
 -echo "configure:27947: checking how to run the C preprocessor" >&5
-+echo "configure:28967: checking how to run the C preprocessor" >&5
++echo "configure:28969: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
-@@ -27958,13 +28978,13 @@
+@@ -27958,13 +28980,13 @@ else
    # On the NeXT, cc -E runs the code through the compiler's parser,
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
 -#line 27962 "configure"
-+#line 28982 "configure"
++#line 28984 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:27968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:28988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:28990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
-@@ -27975,13 +28995,13 @@
+@@ -27975,13 +28997,13 @@ else
    rm -rf conftest*
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
 -#line 27979 "configure"
-+#line 28999 "configure"
++#line 29001 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:27985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:29005: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:29007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
-@@ -27992,13 +29012,13 @@
+@@ -27992,13 +29014,13 @@ else
    rm -rf conftest*
    CPP="${CC-cc} -nologo -E"
    cat > conftest.$ac_ext <<EOF
 -#line 27996 "configure"
-+#line 29016 "configure"
++#line 29018 "configure"
  #include "confdefs.h"
  #include <assert.h>
  Syntax Error
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:28002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:29022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:29024: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
-@@ -28023,14 +29043,14 @@
+@@ -28023,14 +29045,14 @@ fi
  echo "$ac_t""$CPP" 1>&6
  
      echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6
 -echo "configure:28027: checking for openssl support in libcurl" >&5
-+echo "configure:29047: checking for openssl support in libcurl" >&5
++echo "configure:29049: checking for openssl support in libcurl" >&5
      if test "$cross_compiling" = yes; then
    
        echo "$ac_t""no" 1>&6
@@ -6101,46 +6110,46 @@
  else
    cat > conftest.$ac_ext <<EOF
 -#line 28034 "configure"
-+#line 29054 "configure"
++#line 29056 "configure"
  #include "confdefs.h"
  
  #include <curl/curl.h>
-@@ -28049,7 +29069,7 @@
+@@ -28049,7 +29071,7 @@ int main(int argc, char *argv[])
  }
      
  EOF
 -if { (eval echo configure:28053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:29073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:29075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
        echo "$ac_t""yes" 1>&6
-@@ -28057,17 +29077,17 @@
+@@ -28057,17 +29079,17 @@ then
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:28061: checking for $ac_hdr" >&5
-+echo "configure:29081: checking for $ac_hdr" >&5
++echo "configure:29083: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 28066 "configure"
-+#line 29086 "configure"
++#line 29088 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:28071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:29091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:29093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -28112,14 +29132,14 @@
+@@ -28112,14 +29134,14 @@ fi
  
     
      echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6
 -echo "configure:28116: checking for gnutls support in libcurl" >&5
-+echo "configure:29136: checking for gnutls support in libcurl" >&5
++echo "configure:29138: checking for gnutls support in libcurl" >&5
      if test "$cross_compiling" = yes; then
    
        echo "$ac_t""no" 1>&6
@@ -6148,2270 +6157,2613 @@
  else
    cat > conftest.$ac_ext <<EOF
 -#line 28123 "configure"
-+#line 29143 "configure"
++#line 29145 "configure"
  #include "confdefs.h"
  
  #include <curl/curl.h>
-@@ -28138,23 +29158,23 @@
+@@ -28138,23 +29160,23 @@ int main(int argc, char *argv[])
  }
  
  EOF
 -if { (eval echo configure:28142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:29162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:29164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
        echo "$ac_t""yes" 1>&6
        ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6
 -echo "configure:28148: checking for gcrypt.h" >&5
-+echo "configure:29168: checking for gcrypt.h" >&5
++echo "configure:29170: checking for gcrypt.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 28153 "configure"
-+#line 29173 "configure"
++#line 29175 "configure"
  #include "confdefs.h"
  #include <gcrypt.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:28158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:29178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:29180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -28296,7 +29316,7 @@
+@@ -28296,7 +29318,7 @@ fi
    done
  
    echo $ac_n "checking for curl_easy_perform in -lcurl""... $ac_c" 1>&6
 -echo "configure:28300: checking for curl_easy_perform in -lcurl" >&5
-+echo "configure:29320: checking for curl_easy_perform in -lcurl" >&5
++echo "configure:29322: checking for curl_easy_perform in -lcurl" >&5
  ac_lib_var=`echo curl'_'curl_easy_perform | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -28304,7 +29324,7 @@
+@@ -28304,7 +29326,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lcurl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 28308 "configure"
-+#line 29328 "configure"
++#line 29330 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -28315,7 +29335,7 @@
+@@ -28315,7 +29337,7 @@ int main() {
  curl_easy_perform()
  ; return 0; }
  EOF
 -if { (eval echo configure:28319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:29339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:29341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -28451,7 +29471,7 @@
+@@ -28451,7 +29473,7 @@ fi
    done
  
    echo $ac_n "checking for curl_version_info in -lcurl""... $ac_c" 1>&6
 -echo "configure:28455: checking for curl_version_info in -lcurl" >&5
-+echo "configure:29475: checking for curl_version_info in -lcurl" >&5
++echo "configure:29477: checking for curl_version_info in -lcurl" >&5
  ac_lib_var=`echo curl'_'curl_version_info | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -28459,7 +29479,7 @@
+@@ -28459,7 +29481,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lcurl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 28463 "configure"
-+#line 29483 "configure"
++#line 29485 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -28470,7 +29490,7 @@
+@@ -28470,7 +29492,7 @@ int main() {
  curl_version_info()
  ; return 0; }
  EOF
 -if { (eval echo configure:28474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:29494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:29496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -28604,7 +29624,7 @@
+@@ -28604,7 +29626,7 @@ fi
    done
  
    echo $ac_n "checking for curl_easy_strerror in -lcurl""... $ac_c" 1>&6
 -echo "configure:28608: checking for curl_easy_strerror in -lcurl" >&5
-+echo "configure:29628: checking for curl_easy_strerror in -lcurl" >&5
++echo "configure:29630: checking for curl_easy_strerror in -lcurl" >&5
  ac_lib_var=`echo curl'_'curl_easy_strerror | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -28612,7 +29632,7 @@
+@@ -28612,7 +29634,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lcurl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 28616 "configure"
-+#line 29636 "configure"
++#line 29638 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -28623,7 +29643,7 @@
+@@ -28623,7 +29645,7 @@ int main() {
  curl_easy_strerror()
  ; return 0; }
  EOF
 -if { (eval echo configure:28627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:29647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:29649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -28757,7 +29777,7 @@
+@@ -28757,7 +29779,7 @@ fi
    done
  
    echo $ac_n "checking for curl_multi_strerror in -lcurl""... $ac_c" 1>&6
 -echo "configure:28761: checking for curl_multi_strerror in -lcurl" >&5
-+echo "configure:29781: checking for curl_multi_strerror in -lcurl" >&5
++echo "configure:29783: checking for curl_multi_strerror in -lcurl" >&5
  ac_lib_var=`echo curl'_'curl_multi_strerror | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -28765,7 +29785,7 @@
+@@ -28765,7 +29787,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lcurl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 28769 "configure"
-+#line 29789 "configure"
++#line 29791 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -28776,7 +29796,7 @@
+@@ -28776,7 +29798,7 @@ int main() {
  curl_multi_strerror()
  ; return 0; }
  EOF
 -if { (eval echo configure:28780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:29800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:29802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -29462,7 +30482,7 @@
+@@ -29462,7 +30484,7 @@ if test "$PHP_QDBM" != "no"; then
    done
  
    echo $ac_n "checking for dpopen in -l$LIB""... $ac_c" 1>&6
 -echo "configure:29466: checking for dpopen in -l$LIB" >&5
-+echo "configure:30486: checking for dpopen in -l$LIB" >&5
++echo "configure:30488: checking for dpopen in -l$LIB" >&5
  ac_lib_var=`echo $LIB'_'dpopen | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -29470,7 +30490,7 @@
+@@ -29470,7 +30492,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$LIB  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 29474 "configure"
-+#line 30494 "configure"
++#line 30496 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -29481,7 +30501,7 @@
+@@ -29481,7 +30503,7 @@ int main() {
  dpopen()
  ; return 0; }
  EOF
 -if { (eval echo configure:29485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:30505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:30507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -29650,7 +30670,7 @@
+@@ -29650,7 +30672,7 @@ fi
      THIS_FULL_NAME="$THIS_NAME"
    fi
    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
 -echo "configure:29654: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:30674: checking for $THIS_FULL_NAME support" >&5
++echo "configure:30676: checking for $THIS_FULL_NAME support" >&5
    if test -n ""; then
      { echo "configure: error: " 1>&2; exit 1; }
    fi
-@@ -29678,7 +30698,7 @@
+@@ -29678,7 +30700,7 @@ if test "$PHP_GDBM" != "no"; then
      THIS_FULL_NAME="$THIS_NAME"
    fi
    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
 -echo "configure:29682: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:30702: checking for $THIS_FULL_NAME support" >&5
++echo "configure:30704: checking for $THIS_FULL_NAME support" >&5
    if test -n "You cannot combine --with-gdbm with --with-qdbm"; then
      { echo "configure: error: You cannot combine --with-gdbm with --with-qdbm" 1>&2; exit 1; }
    fi
-@@ -29797,7 +30817,7 @@
+@@ -29797,7 +30819,7 @@ echo "configure:29682: checking for $THIS_FULL_NAME support" >&5
    done
  
    echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6
 -echo "configure:29801: checking for gdbm_open in -lgdbm" >&5
-+echo "configure:30821: checking for gdbm_open in -lgdbm" >&5
++echo "configure:30823: checking for gdbm_open in -lgdbm" >&5
  ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -29805,7 +30825,7 @@
+@@ -29805,7 +30827,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgdbm  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 29809 "configure"
-+#line 30829 "configure"
++#line 30831 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -29816,7 +30836,7 @@
+@@ -29816,7 +30838,7 @@ int main() {
  gdbm_open()
  ; return 0; }
  EOF
 -if { (eval echo configure:29820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:30840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:30842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -29981,7 +31001,7 @@
+@@ -29981,7 +31003,7 @@ fi
      THIS_FULL_NAME="$THIS_NAME"
    fi
    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
 -echo "configure:29985: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:31005: checking for $THIS_FULL_NAME support" >&5
++echo "configure:31007: checking for $THIS_FULL_NAME support" >&5
    if test -n ""; then
      { echo "configure: error: " 1>&2; exit 1; }
    fi
-@@ -30110,7 +31130,7 @@
+@@ -30110,7 +31132,7 @@ if test "$PHP_NDBM" != "no"; then
    done
  
    echo $ac_n "checking for dbm_open in -l$LIB""... $ac_c" 1>&6
 -echo "configure:30114: checking for dbm_open in -l$LIB" >&5
-+echo "configure:31134: checking for dbm_open in -l$LIB" >&5
++echo "configure:31136: checking for dbm_open in -l$LIB" >&5
  ac_lib_var=`echo $LIB'_'dbm_open | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -30118,7 +31138,7 @@
+@@ -30118,7 +31140,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$LIB  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 30122 "configure"
-+#line 31142 "configure"
++#line 31144 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -30129,7 +31149,7 @@
+@@ -30129,7 +31151,7 @@ int main() {
  dbm_open()
  ; return 0; }
  EOF
 -if { (eval echo configure:30133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:31153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:31155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -30298,7 +31318,7 @@
+@@ -30298,7 +31320,7 @@ fi
      THIS_FULL_NAME="$THIS_NAME"
    fi
    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
 -echo "configure:30302: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:31322: checking for $THIS_FULL_NAME support" >&5
++echo "configure:31324: checking for $THIS_FULL_NAME support" >&5
    if test -n ""; then
      { echo "configure: error: " 1>&2; exit 1; }
    fi
-@@ -30382,7 +31402,7 @@
+@@ -30382,7 +31404,7 @@ if test "$PHP_DB4" != "no"; then
    LIBS="-l$LIB $LIBS"
    
          cat > conftest.$ac_ext <<EOF
 -#line 30386 "configure"
-+#line 31406 "configure"
++#line 31408 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -30393,11 +31413,11 @@
+@@ -30393,11 +31415,11 @@ int main() {
          
  ; return 0; }
  EOF
 -if { (eval echo configure:30397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:31417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:31419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    
            cat > conftest.$ac_ext <<EOF
 -#line 30401 "configure"
-+#line 31421 "configure"
++#line 31423 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -30434,14 +31454,14 @@
+@@ -30434,14 +31456,14 @@ rm -f conftest*
    done
    if test -z "$THIS_LIBS"; then
      echo $ac_n "checking for DB4 major version""... $ac_c" 1>&6
 -echo "configure:30438: checking for DB4 major version" >&5
-+echo "configure:31458: checking for DB4 major version" >&5
++echo "configure:31460: checking for DB4 major version" >&5
      { echo "configure: error: Header contains different version" 1>&2; exit 1; }
    fi
    if test "4" = "4"; then
      echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6
 -echo "configure:30443: checking for DB4 minor version and patch level" >&5
-+echo "configure:31463: checking for DB4 minor version and patch level" >&5
++echo "configure:31465: checking for DB4 minor version and patch level" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 30445 "configure"
-+#line 31465 "configure"
++#line 31467 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -30467,9 +31487,9 @@
+@@ -30467,9 +31489,9 @@ rm -f conftest*
    fi
    if test "$ext_shared" = "yes"; then
      echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
 -echo "configure:30471: checking if dba can be used as shared extension" >&5
-+echo "configure:31491: checking if dba can be used as shared extension" >&5
++echo "configure:31493: checking if dba can be used as shared extension" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 30473 "configure"
-+#line 31493 "configure"
++#line 31495 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -30626,7 +31646,7 @@
+@@ -30626,7 +31648,7 @@ fi
      THIS_FULL_NAME="$THIS_NAME"
    fi
    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
 -echo "configure:30630: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:31650: checking for $THIS_FULL_NAME support" >&5
++echo "configure:31652: checking for $THIS_FULL_NAME support" >&5
    if test -n ""; then
      { echo "configure: error: " 1>&2; exit 1; }
    fi
-@@ -30654,7 +31674,7 @@
+@@ -30654,7 +31676,7 @@ if test "$PHP_DB3" != "no"; then
      THIS_FULL_NAME="$THIS_NAME"
    fi
    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
 -echo "configure:30658: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:31678: checking for $THIS_FULL_NAME support" >&5
++echo "configure:31680: checking for $THIS_FULL_NAME support" >&5
    if test -n "You cannot combine --with-db3 with --with-db4"; then
      { echo "configure: error: You cannot combine --with-db3 with --with-db4" 1>&2; exit 1; }
    fi
-@@ -30705,7 +31725,7 @@
+@@ -30705,7 +31727,7 @@ echo "configure:30658: checking for $THIS_FULL_NAME support" >&5
    LIBS="-l$LIB $LIBS"
    
          cat > conftest.$ac_ext <<EOF
 -#line 30709 "configure"
-+#line 31729 "configure"
++#line 31731 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -30716,11 +31736,11 @@
+@@ -30716,11 +31738,11 @@ int main() {
          
  ; return 0; }
  EOF
 -if { (eval echo configure:30720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:31740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:31742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    
            cat > conftest.$ac_ext <<EOF
 -#line 30724 "configure"
-+#line 31744 "configure"
++#line 31746 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -30757,14 +31777,14 @@
+@@ -30757,14 +31779,14 @@ rm -f conftest*
    done
    if test -z "$THIS_LIBS"; then
      echo $ac_n "checking for DB3 major version""... $ac_c" 1>&6
 -echo "configure:30761: checking for DB3 major version" >&5
-+echo "configure:31781: checking for DB3 major version" >&5
++echo "configure:31783: checking for DB3 major version" >&5
      { echo "configure: error: Header contains different version" 1>&2; exit 1; }
    fi
    if test "3" = "4"; then
      echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6
 -echo "configure:30766: checking for DB4 minor version and patch level" >&5
-+echo "configure:31786: checking for DB4 minor version and patch level" >&5
++echo "configure:31788: checking for DB4 minor version and patch level" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 30768 "configure"
-+#line 31788 "configure"
++#line 31790 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -30790,9 +31810,9 @@
+@@ -30790,9 +31812,9 @@ rm -f conftest*
    fi
    if test "$ext_shared" = "yes"; then
      echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
 -echo "configure:30794: checking if dba can be used as shared extension" >&5
-+echo "configure:31814: checking if dba can be used as shared extension" >&5
++echo "configure:31816: checking if dba can be used as shared extension" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 30796 "configure"
-+#line 31816 "configure"
++#line 31818 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -30949,7 +31969,7 @@
+@@ -30949,7 +31971,7 @@ fi
      THIS_FULL_NAME="$THIS_NAME"
    fi
    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
 -echo "configure:30953: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:31973: checking for $THIS_FULL_NAME support" >&5
++echo "configure:31975: checking for $THIS_FULL_NAME support" >&5
    if test -n ""; then
      { echo "configure: error: " 1>&2; exit 1; }
    fi
-@@ -30977,7 +31997,7 @@
+@@ -30977,7 +31999,7 @@ if test "$PHP_DB2" != "no"; then
      THIS_FULL_NAME="$THIS_NAME"
    fi
    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
 -echo "configure:30981: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:32001: checking for $THIS_FULL_NAME support" >&5
++echo "configure:32003: checking for $THIS_FULL_NAME support" >&5
    if test -n "You cannot combine --with-db2 with --with-db3 or --with-db4"; then
      { echo "configure: error: You cannot combine --with-db2 with --with-db3 or --with-db4" 1>&2; exit 1; }
    fi
-@@ -31028,7 +32048,7 @@
+@@ -31028,7 +32050,7 @@ echo "configure:30981: checking for $THIS_FULL_NAME support" >&5
    LIBS="-l$LIB $LIBS"
    
          cat > conftest.$ac_ext <<EOF
 -#line 31032 "configure"
-+#line 32052 "configure"
++#line 32054 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -31039,11 +32059,11 @@
+@@ -31039,11 +32061,11 @@ int main() {
          
  ; return 0; }
  EOF
 -if { (eval echo configure:31043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:32063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:32065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    
            cat > conftest.$ac_ext <<EOF
 -#line 31047 "configure"
-+#line 32067 "configure"
++#line 32069 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -31080,14 +32100,14 @@
+@@ -31080,14 +32102,14 @@ rm -f conftest*
    done
    if test -z "$THIS_LIBS"; then
      echo $ac_n "checking for DB2 major version""... $ac_c" 1>&6
 -echo "configure:31084: checking for DB2 major version" >&5
-+echo "configure:32104: checking for DB2 major version" >&5
++echo "configure:32106: checking for DB2 major version" >&5
      { echo "configure: error: Header contains different version" 1>&2; exit 1; }
    fi
    if test "2" = "4"; then
      echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6
 -echo "configure:31089: checking for DB4 minor version and patch level" >&5
-+echo "configure:32109: checking for DB4 minor version and patch level" >&5
++echo "configure:32111: checking for DB4 minor version and patch level" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 31091 "configure"
-+#line 32111 "configure"
++#line 32113 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -31113,9 +32133,9 @@
+@@ -31113,9 +32135,9 @@ rm -f conftest*
    fi
    if test "$ext_shared" = "yes"; then
      echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6
 -echo "configure:31117: checking if dba can be used as shared extension" >&5
-+echo "configure:32137: checking if dba can be used as shared extension" >&5
++echo "configure:32139: checking if dba can be used as shared extension" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 31119 "configure"
-+#line 32139 "configure"
++#line 32141 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -31272,7 +32292,7 @@
+@@ -31272,7 +32294,7 @@ fi
      THIS_FULL_NAME="$THIS_NAME"
    fi
    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
 -echo "configure:31276: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:32296: checking for $THIS_FULL_NAME support" >&5
++echo "configure:32298: checking for $THIS_FULL_NAME support" >&5
    if test -n ""; then
      { echo "configure: error: " 1>&2; exit 1; }
    fi
-@@ -31292,7 +32312,7 @@
+@@ -31292,7 +32314,7 @@ if test "$PHP_DB1" != "no"; then
    unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
  
    echo $ac_n "checking for DB1 in library""... $ac_c" 1>&6
 -echo "configure:31296: checking for DB1 in library" >&5
-+echo "configure:32316: checking for DB1 in library" >&5
++echo "configure:32318: checking for DB1 in library" >&5
    if test "$HAVE_DB4" = "1"; then
      THIS_VERSION=4
      THIS_LIBS=$DB4_LIBS
-@@ -31340,7 +32360,7 @@
+@@ -31340,7 +32362,7 @@ EOF
    fi
    echo "$ac_t""$THIS_LIBS" 1>&6
    echo $ac_n "checking for DB1 in header""... $ac_c" 1>&6
 -echo "configure:31344: checking for DB1 in header" >&5
-+echo "configure:32364: checking for DB1 in header" >&5
++echo "configure:32366: checking for DB1 in header" >&5
    echo "$ac_t""$THIS_INCLUDE" 1>&6
    if test -n "$THIS_INCLUDE"; then
      
-@@ -31350,7 +32370,7 @@
+@@ -31350,7 +32372,7 @@ echo "configure:31344: checking for DB1 in header" >&5
    LIBS="-l$THIS_LIBS $LIBS"
    
        cat > conftest.$ac_ext <<EOF
 -#line 31354 "configure"
-+#line 32374 "configure"
++#line 32376 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -31361,7 +32381,7 @@
+@@ -31361,7 +32383,7 @@ int main() {
        
  ; return 0; }
  EOF
 -if { (eval echo configure:31365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:32385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:32387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    
          cat >> confdefs.h <<EOF
-@@ -31511,7 +32531,7 @@
+@@ -31511,7 +32533,7 @@ fi
      THIS_FULL_NAME="$THIS_NAME"
    fi
    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
 -echo "configure:31515: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:32535: checking for $THIS_FULL_NAME support" >&5
++echo "configure:32537: checking for $THIS_FULL_NAME support" >&5
    if test -n ""; then
      { echo "configure: error: " 1>&2; exit 1; }
    fi
-@@ -31539,7 +32559,7 @@
+@@ -31539,7 +32561,7 @@ if test "$PHP_DBM" != "no"; then
      THIS_FULL_NAME="$THIS_NAME"
    fi
    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
 -echo "configure:31543: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:32563: checking for $THIS_FULL_NAME support" >&5
++echo "configure:32565: checking for $THIS_FULL_NAME support" >&5
    if test -n "You cannot combine --with-dbm with --with-qdbm"; then
      { echo "configure: error: You cannot combine --with-dbm with --with-qdbm" 1>&2; exit 1; }
    fi
-@@ -31663,7 +32683,7 @@
+@@ -31663,7 +32685,7 @@ echo "configure:31543: checking for $THIS_FULL_NAME support" >&5
    done
  
    echo $ac_n "checking for dbminit in -l$LIB""... $ac_c" 1>&6
 -echo "configure:31667: checking for dbminit in -l$LIB" >&5
-+echo "configure:32687: checking for dbminit in -l$LIB" >&5
++echo "configure:32689: checking for dbminit in -l$LIB" >&5
  ac_lib_var=`echo $LIB'_'dbminit | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -31671,7 +32691,7 @@
+@@ -31671,7 +32693,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$LIB  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 31675 "configure"
-+#line 32695 "configure"
++#line 32697 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -31682,7 +32702,7 @@
+@@ -31682,7 +32704,7 @@ int main() {
  dbminit()
  ; return 0; }
  EOF
 -if { (eval echo configure:31686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:32706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:32708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -31702,7 +32722,7 @@
+@@ -31702,7 +32724,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
      ext_shared=$save_ext_shared
      
          echo $ac_n "checking for DBM using GDBM""... $ac_c" 1>&6
 -echo "configure:31706: checking for DBM using GDBM" >&5
-+echo "configure:32726: checking for DBM using GDBM" >&5
++echo "configure:32728: checking for DBM using GDBM" >&5
          cat >> confdefs.h <<EOF
  #define DBM_INCLUDE_FILE "$THIS_INCLUDE"
  EOF
-@@ -31866,7 +32886,7 @@
+@@ -31866,7 +32888,7 @@ fi
      THIS_FULL_NAME="$THIS_NAME"
    fi
    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
 -echo "configure:31870: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:32890: checking for $THIS_FULL_NAME support" >&5
++echo "configure:32892: checking for $THIS_FULL_NAME support" >&5
    if test -n ""; then
      { echo "configure: error: " 1>&2; exit 1; }
    fi
-@@ -32078,7 +33098,7 @@
+@@ -32078,7 +33100,7 @@ elif test "$PHP_CDB" != "no"; then
    done
  
    echo $ac_n "checking for cdb_read in -l$LIB""... $ac_c" 1>&6
 -echo "configure:32082: checking for cdb_read in -l$LIB" >&5
-+echo "configure:33102: checking for cdb_read in -l$LIB" >&5
++echo "configure:33104: checking for cdb_read in -l$LIB" >&5
  ac_lib_var=`echo $LIB'_'cdb_read | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -32086,7 +33106,7 @@
+@@ -32086,7 +33108,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$LIB  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 32090 "configure"
-+#line 33110 "configure"
++#line 33112 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -32097,7 +33117,7 @@
+@@ -32097,7 +33119,7 @@ int main() {
  cdb_read()
  ; return 0; }
  EOF
 -if { (eval echo configure:32101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:33121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:33123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -32266,7 +33286,7 @@
+@@ -32266,7 +33288,7 @@ fi
      THIS_FULL_NAME="$THIS_NAME"
    fi
    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
 -echo "configure:32270: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:33290: checking for $THIS_FULL_NAME support" >&5
++echo "configure:33292: checking for $THIS_FULL_NAME support" >&5
    if test -n ""; then
      { echo "configure: error: " 1>&2; exit 1; }
    fi
-@@ -32297,7 +33317,7 @@
+@@ -32297,7 +33319,7 @@ fi
      THIS_FULL_NAME="$THIS_NAME"
    fi
    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
 -echo "configure:32301: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:33321: checking for $THIS_FULL_NAME support" >&5
++echo "configure:33323: checking for $THIS_FULL_NAME support" >&5
    if test -n ""; then
      { echo "configure: error: " 1>&2; exit 1; }
    fi
-@@ -32328,7 +33348,7 @@
+@@ -32328,7 +33350,7 @@ fi
      THIS_FULL_NAME="$THIS_NAME"
    fi
    echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
 -echo "configure:32332: checking for $THIS_FULL_NAME support" >&5
-+echo "configure:33352: checking for $THIS_FULL_NAME support" >&5
++echo "configure:33354: checking for $THIS_FULL_NAME support" >&5
    if test -n ""; then
      { echo "configure: error: " 1>&2; exit 1; }
    fi
-@@ -32343,7 +33363,7 @@
+@@ -32343,7 +33365,7 @@ echo "configure:32332: checking for $THIS_FULL_NAME support" >&5
  
  
  echo $ac_n "checking whether to enable DBA interface""... $ac_c" 1>&6
 -echo "configure:32347: checking whether to enable DBA interface" >&5
-+echo "configure:33367: checking whether to enable DBA interface" >&5
++echo "configure:33369: checking whether to enable DBA interface" >&5
  if test "$HAVE_DBA" = "1"; then
    if test "$ext_shared" = "yes"; then
      echo "$ac_t""yes, shared" 1>&6
-@@ -32673,7 +33693,7 @@
+@@ -32670,10 +33692,350 @@ fi
+ 
+ 
+ 
++php_enable_dio=no
++
++echo $ac_n "checking whether to enable direct I/O support""... $ac_c" 1>&6
++echo "configure:33699: checking whether to enable direct I/O support" >&5
++# Check whether --enable-dio or --disable-dio was given.
++if test "${enable_dio+set}" = set; then
++  enableval="$enable_dio"
++  PHP_DIO=$enableval
++else
++  
++  PHP_DIO=no
++  test "$PHP_ENABLE_ALL" && PHP_DIO=$PHP_ENABLE_ALL
++
++fi
++
++
++
++ext_output="yes, shared"
++ext_shared=yes
++case $PHP_DIO in
++shared,*)
++  PHP_DIO=`echo "$PHP_DIO"|$SED 's/^shared,//'`
++  ;;
++shared)
++  PHP_DIO=yes
++  ;;
++no)
++  ext_output=no
++  ext_shared=no
++  ;;
++*)
++  ext_output=yes
++  ext_shared=no
++  ;;
++esac
++
++
++
++echo "$ac_t""$ext_output" 1>&6
++
++
++
++
++if test "$PHP_DIO" != "no"; then
++  
++  ext_builddir=ext/dio
++  ext_srcdir=$abs_srcdir/ext/dio
++
++  ac_extra=
++
++  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
++    PHP_DIO_SHARED=no
++    
++  
++  case ext/dio in
++  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
++  /*) ac_srcdir=`echo "ext/dio"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
++  *) ac_srcdir="$abs_srcdir/ext/dio/"; ac_bdir="ext/dio/"; 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 dio.c dio_common.c dio_posix.c dio_stream_wrappers.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_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
++        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
++        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
++        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
++      esac
++
++    cat >>Makefile.objects<<EOF
++$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
++      $ac_comp
++EOF
++  done
++
++
++    EXT_STATIC="$EXT_STATIC dio"
++    if test "$ext_shared" != "nocli"; then
++      EXT_CLI_STATIC="$EXT_CLI_STATIC dio"
++    fi
++  else
++    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
++      PHP_DIO_SHARED=yes
++      
++  case ext/dio in
++  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
++  /*) ac_srcdir=`echo "ext/dio"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
++  *) ac_srcdir="$abs_srcdir/ext/dio/"; ac_bdir="ext/dio/"; 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 dio.c dio_common.c dio_posix.c dio_stream_wrappers.c; do
++  
++      IFS=.
++      set $ac_src
++      ac_obj=$1
++      IFS=$old_IFS
++      
++      shared_objects_dio="$shared_objects_dio $ac_bdir$ac_obj.lo"
++
++      case $ac_src in
++        *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
++        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
++        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
++        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
++      esac
++
++    cat >>Makefile.objects<<EOF
++$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
++      $ac_comp
++EOF
++  done
++
++      case $host_alias in
++        *netware*)
++          
++  install_modules="install-modules"
++
++  case $host_alias in
++    *aix*)
++      suffix=so
++      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpdio.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dio) $(PHPDIO_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpdio.so '$ext_builddir'/phpdio.so'
++      ;;
++    *netware*)
++      suffix=nlm
++      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dio) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPDIO, 3)_SHARED_LIBADD)'
++      ;;
++    *)
++      suffix=la
++      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dio) $(PHPDIO_SHARED_LIBADD)'
++      ;;
++  esac
++
++  if test "x" = "xyes"; then
++    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpdio.$suffix"
++  else
++    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpdio.$suffix"
++  fi
++  
++  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dio"
++
++  cat >>Makefile.objects<<EOF
++\$(phplibdir)/phpdio.$suffix: $ext_builddir/phpdio.$suffix
++      \$(LIBTOOL) --mode=install cp $ext_builddir/phpdio.$suffix \$(phplibdir)
++
++$ext_builddir/phpdio.$suffix: \$(shared_objects_dio) \$(PHPDIO_SHARED_DEPENDENCIES)
++      $link_cmd
++
++EOF
++
++          ;;
++        *)
++          
++  install_modules="install-modules"
++
++  case $host_alias in
++    *aix*)
++      suffix=so
++      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/dio.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dio) $(DIO_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/dio.so '$ext_builddir'/dio.so'
++      ;;
++    *netware*)
++      suffix=nlm
++      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dio) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(DIO, 3)_SHARED_LIBADD)'
++      ;;
++    *)
++      suffix=la
++      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dio) $(DIO_SHARED_LIBADD)'
++      ;;
++  esac
++
++  if test "x" = "xyes"; then
++    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/dio.$suffix"
++  else
++    PHP_MODULES="$PHP_MODULES \$(phplibdir)/dio.$suffix"
++  fi
++  
++  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dio"
++
++  cat >>Makefile.objects<<EOF
++\$(phplibdir)/dio.$suffix: $ext_builddir/dio.$suffix
++      \$(LIBTOOL) --mode=install cp $ext_builddir/dio.$suffix \$(phplibdir)
++
++$ext_builddir/dio.$suffix: \$(shared_objects_dio) \$(DIO_SHARED_DEPENDENCIES)
++      $link_cmd
++
++EOF
++
++          ;;
++      esac
++      cat >> confdefs.h <<EOF
++#define COMPILE_DL_DIO 1
++EOF
++
++    fi
++  fi
++
++  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
++    PHP_DIO_SHARED=no
++    case "$PHP_SAPI" in
++      cgi|embed)
++        
++  
++  case ext/dio in
++  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
++  /*) ac_srcdir=`echo "ext/dio"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
++  *) ac_srcdir="$abs_srcdir/ext/dio/"; ac_bdir="ext/dio/"; 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 dio.c dio_common.c dio_posix.c dio_stream_wrappers.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_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
++        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
++        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
++        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
++      esac
++
++    cat >>Makefile.objects<<EOF
++$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
++      $ac_comp
++EOF
++  done
++
++
++        EXT_STATIC="$EXT_STATIC dio"
++        ;;
++      *)
++        
++  
++  case ext/dio in
++  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
++  /*) ac_srcdir=`echo "ext/dio"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
++  *) ac_srcdir="$abs_srcdir/ext/dio/"; ac_bdir="ext/dio/"; 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 dio.c dio_common.c dio_posix.c dio_stream_wrappers.c; do
++  
++      IFS=.
++      set $ac_src
++      ac_obj=$1
++      IFS=$old_IFS
++      
++      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
++
++      case $ac_src in
++        *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
++        *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
++        *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;;
++        *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;;
++      esac
++
++    cat >>Makefile.objects<<EOF
++$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
++      $ac_comp
++EOF
++  done
++
++
++        ;;
++    esac
++    EXT_CLI_STATIC="$EXT_CLI_STATIC dio"
++  fi
++  
++  
++    BUILD_DIR="$BUILD_DIR $ext_builddir"
++  
++
++
++  if test "$ext_builddir" = "."; then
++    PHP_PECL_EXTENSION=dio
++    
++  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
++
++  fi
++
++fi
++
++
++
  php_enable_dom=yes
  
  echo $ac_n "checking whether to enable DOM support""... $ac_c" 1>&6
 -echo "configure:32677: checking whether to enable DOM support" >&5
-+echo "configure:33697: checking whether to enable DOM support" >&5
++echo "configure:34039: checking whether to enable DOM support" >&5
  # Check whether --enable-dom or --disable-dom was given.
  if test "${enable_dom+set}" = set; then
    enableval="$enable_dom"
-@@ -32718,7 +33738,7 @@
+@@ -32718,7 +34080,7 @@ if test -z "$PHP_LIBXML_DIR"; then
  php_with_libxml_dir=no
  
  echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
 -echo "configure:32722: checking libxml2 install dir" >&5
-+echo "configure:33742: checking libxml2 install dir" >&5
++echo "configure:34084: checking libxml2 install dir" >&5
  # Check whether --with-libxml-dir or --without-libxml-dir was given.
  if test "${with_libxml_dir+set}" = set; then
    withval="$with_libxml_dir"
-@@ -32746,7 +33766,7 @@
+@@ -32746,7 +34108,7 @@ if test "$PHP_DOM" != "no"; then
  
    
  echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
 -echo "configure:32750: checking for xml2-config path" >&5
-+echo "configure:33770: checking for xml2-config path" >&5
++echo "configure:34112: checking for xml2-config path" >&5
  if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -32904,7 +33924,7 @@
+@@ -32904,7 +34266,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
  
  
              echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
 -echo "configure:32908: checking whether libxml build works" >&5
-+echo "configure:33928: checking whether libxml build works" >&5
++echo "configure:34270: checking whether libxml build works" >&5
  if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -32920,7 +33940,7 @@
+@@ -32920,7 +34282,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 32924 "configure"
-+#line 33944 "configure"
++#line 34286 "configure"
  #include "confdefs.h"
  
      
-@@ -32931,7 +33951,7 @@
+@@ -32931,7 +34293,7 @@ else
      }
    
  EOF
 -if { (eval echo configure:32935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:33955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:34297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      LIBS=$old_LIBS
-@@ -33354,7 +34374,7 @@
+@@ -33354,7 +34716,7 @@ fi
  php_with_enchant=no
  
  echo $ac_n "checking for ENCHANT support""... $ac_c" 1>&6
 -echo "configure:33358: checking for ENCHANT support" >&5
-+echo "configure:34378: checking for ENCHANT support" >&5
++echo "configure:34720: checking for ENCHANT support" >&5
  # Check whether --with-enchant or --without-enchant was given.
  if test "${with_enchant+set}" = set; then
    withval="$with_enchant"
-@@ -33939,7 +34959,7 @@
+@@ -33939,7 +35301,7 @@ EOF
    done
  
    echo $ac_n "checking for enchant_broker_set_param in -lenchant""... $ac_c" 1>&6
 -echo "configure:33943: checking for enchant_broker_set_param in -lenchant" >&5
-+echo "configure:34963: checking for enchant_broker_set_param in -lenchant" >&5
++echo "configure:35305: checking for enchant_broker_set_param in -lenchant" >&5
  ac_lib_var=`echo enchant'_'enchant_broker_set_param | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -33947,7 +34967,7 @@
+@@ -33947,7 +35309,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lenchant  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 33951 "configure"
-+#line 34971 "configure"
++#line 35313 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -33958,7 +34978,7 @@
+@@ -33958,7 +35320,7 @@ int main() {
  enchant_broker_set_param()
  ; return 0; }
  EOF
 -if { (eval echo configure:33962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:34982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:35324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -34005,7 +35025,7 @@
+@@ -34005,7 +35367,7 @@ fi
  php_enable_exif=no
  
  echo $ac_n "checking whether to enable EXIF (metadata from images) support""... $ac_c" 1>&6
 -echo "configure:34009: checking whether to enable EXIF (metadata from images) support" >&5
-+echo "configure:35029: checking whether to enable EXIF (metadata from images) support" >&5
++echo "configure:35371: checking whether to enable EXIF (metadata from images) support" >&5
  # Check whether --enable-exif or --disable-exif was given.
  if test "${enable_exif+set}" = set; then
    enableval="$enable_exif"
-@@ -34349,7 +35369,7 @@
+@@ -34349,7 +35711,7 @@ fi
  php_enable_fileinfo=yes
  
  echo $ac_n "checking for fileinfo support""... $ac_c" 1>&6
 -echo "configure:34353: checking for fileinfo support" >&5
-+echo "configure:35373: checking for fileinfo support" >&5
++echo "configure:35715: checking for fileinfo support" >&5
  # Check whether --enable-fileinfo or --disable-fileinfo was given.
  if test "${enable_fileinfo+set}" = set; then
    enableval="$enable_fileinfo"
-@@ -34699,12 +35719,12 @@
+@@ -34699,12 +36061,12 @@ EOF
    for ac_func in utimes strndup
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:34703: checking for $ac_func" >&5
-+echo "configure:35723: checking for $ac_func" >&5
++echo "configure:36065: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 34708 "configure"
-+#line 35728 "configure"
++#line 36070 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -34727,7 +35747,7 @@
+@@ -34727,7 +36089,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:34731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:35751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:36093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -34765,7 +35785,7 @@
+@@ -34765,7 +36127,7 @@ fi
  php_enable_filter=yes
  
  echo $ac_n "checking whether to enable input filter support""... $ac_c" 1>&6
 -echo "configure:34769: checking whether to enable input filter support" >&5
-+echo "configure:35789: checking whether to enable input filter support" >&5
++echo "configure:36131: checking whether to enable input filter support" >&5
  # Check whether --enable-filter or --disable-filter was given.
  if test "${enable_filter+set}" = set; then
    enableval="$enable_filter"
-@@ -34809,7 +35829,7 @@
+@@ -34809,7 +36171,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_with_pcre_dir=no
  
  echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6
 -echo "configure:34813: checking pcre install prefix" >&5
-+echo "configure:35833: checking pcre install prefix" >&5
++echo "configure:36175: checking pcre install prefix" >&5
  # Check whether --with-pcre-dir or --without-pcre-dir was given.
  if test "${with_pcre_dir+set}" = set; then
    withval="$with_pcre_dir"
-@@ -34836,7 +35856,7 @@
+@@ -34836,7 +36198,7 @@ if test "$PHP_FILTER" != "no"; then
          old_CPPFLAGS=$CPPFLAGS
      CPPFLAGS=$INCLUDES
      cat > conftest.$ac_ext <<EOF
 -#line 34840 "configure"
-+#line 35860 "configure"
++#line 36202 "configure"
  #include "confdefs.h"
  
  #include <main/php_config.h>
-@@ -34855,7 +35875,7 @@
+@@ -34855,7 +36217,7 @@ else
    rm -rf conftest*
    
        cat > conftest.$ac_ext <<EOF
 -#line 34859 "configure"
-+#line 35879 "configure"
++#line 36221 "configure"
  #include "confdefs.h"
  
  #include <main/php_config.h>
-@@ -35225,7 +36245,7 @@
+@@ -35225,7 +36587,7 @@ fi
  php_enable_ftp=no
  
  echo $ac_n "checking whether to enable FTP support""... $ac_c" 1>&6
 -echo "configure:35229: checking whether to enable FTP support" >&5
-+echo "configure:36249: checking whether to enable FTP support" >&5
++echo "configure:36591: checking whether to enable FTP support" >&5
  # Check whether --enable-ftp or --disable-ftp was given.
  if test "${enable_ftp+set}" = set; then
    enableval="$enable_ftp"
-@@ -35269,7 +36289,7 @@
+@@ -35269,7 +36631,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_with_openssl_dir=no
  
  echo $ac_n "checking OpenSSL dir for FTP""... $ac_c" 1>&6
 -echo "configure:35273: checking OpenSSL dir for FTP" >&5
-+echo "configure:36293: checking OpenSSL dir for FTP" >&5
++echo "configure:36635: checking OpenSSL dir for FTP" >&5
  # Check whether --with-openssl-dir or --without-openssl-dir was given.
  if test "${with_openssl_dir+set}" = set; then
    withval="$with_openssl_dir"
-@@ -35607,7 +36627,7 @@
+@@ -35607,7 +36969,7 @@ EOF
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:35611: checking for $ac_word" >&5
-+echo "configure:36631: checking for $ac_word" >&5
++echo "configure:36973: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -35812,9 +36832,9 @@
+@@ -35812,9 +37174,9 @@ fi
      old_CPPFLAGS=$CPPFLAGS
      CPPFLAGS=-I$OPENSSL_INCDIR
      echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
 -echo "configure:35816: checking for OpenSSL version" >&5
-+echo "configure:36836: checking for OpenSSL version" >&5
++echo "configure:37178: checking for OpenSSL version" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 35818 "configure"
-+#line 36838 "configure"
++#line 37180 "configure"
  #include "confdefs.h"
  
  #include <openssl/opensslv.h>
-@@ -35969,7 +36989,7 @@
+@@ -35969,7 +37331,7 @@ rm -f conftest*
    done
  
    echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
 -echo "configure:35973: checking for CRYPTO_free in -lcrypto" >&5
-+echo "configure:36993: checking for CRYPTO_free in -lcrypto" >&5
++echo "configure:37335: checking for CRYPTO_free in -lcrypto" >&5
  ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -35977,7 +36997,7 @@
+@@ -35977,7 +37339,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lcrypto  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 35981 "configure"
-+#line 37001 "configure"
++#line 37343 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -35988,7 +37008,7 @@
+@@ -35988,7 +37350,7 @@ int main() {
  CRYPTO_free()
  ; return 0; }
  EOF
 -if { (eval echo configure:35992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:37012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:37354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -36145,7 +37165,7 @@
+@@ -36145,7 +37507,7 @@ fi
    done
  
    echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
 -echo "configure:36149: checking for SSL_CTX_set_ssl_version in -lssl" >&5
-+echo "configure:37169: checking for SSL_CTX_set_ssl_version in -lssl" >&5
++echo "configure:37511: checking for SSL_CTX_set_ssl_version in -lssl" >&5
  ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -36153,7 +37173,7 @@
+@@ -36153,7 +37515,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lssl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 36157 "configure"
-+#line 37177 "configure"
++#line 37519 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -36164,7 +37184,7 @@
+@@ -36164,7 +37526,7 @@ int main() {
  SSL_CTX_set_ssl_version()
  ; return 0; }
  EOF
 -if { (eval echo configure:36168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:37188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:37530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -36283,7 +37303,7 @@
+@@ -36283,7 +37645,7 @@ fi
  php_with_gd=no
  
  echo $ac_n "checking for GD support""... $ac_c" 1>&6
 -echo "configure:36287: checking for GD support" >&5
-+echo "configure:37307: checking for GD support" >&5
++echo "configure:37649: checking for GD support" >&5
  # Check whether --with-gd or --without-gd was given.
  if test "${with_gd+set}" = set; then
    withval="$with_gd"
-@@ -36328,7 +37348,7 @@
+@@ -36328,7 +37690,7 @@ if test -z "$PHP_JPEG_DIR"; then
  php_with_jpeg_dir=no
  
  echo $ac_n "checking for the location of libjpeg""... $ac_c" 1>&6
 -echo "configure:36332: checking for the location of libjpeg" >&5
-+echo "configure:37352: checking for the location of libjpeg" >&5
++echo "configure:37694: checking for the location of libjpeg" >&5
  # Check whether --with-jpeg-dir or --without-jpeg-dir was given.
  if test "${with_jpeg_dir+set}" = set; then
    withval="$with_jpeg_dir"
-@@ -36353,7 +37373,7 @@
+@@ -36353,7 +37715,7 @@ if test -z "$PHP_PNG_DIR"; then
  php_with_png_dir=no
  
  echo $ac_n "checking for the location of libpng""... $ac_c" 1>&6
 -echo "configure:36357: checking for the location of libpng" >&5
-+echo "configure:37377: checking for the location of libpng" >&5
++echo "configure:37719: checking for the location of libpng" >&5
  # Check whether --with-png-dir or --without-png-dir was given.
  if test "${with_png_dir+set}" = set; then
    withval="$with_png_dir"
-@@ -36378,7 +37398,7 @@
+@@ -36378,7 +37740,7 @@ if test -z "$PHP_ZLIB_DIR"; then
  php_with_zlib_dir=no
  
  echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
 -echo "configure:36382: checking for the location of libz" >&5
-+echo "configure:37402: checking for the location of libz" >&5
++echo "configure:37744: checking for the location of libz" >&5
  # Check whether --with-zlib-dir or --without-zlib-dir was given.
  if test "${with_zlib_dir+set}" = set; then
    withval="$with_zlib_dir"
-@@ -36402,7 +37422,7 @@
+@@ -36402,7 +37764,7 @@ fi
  php_with_xpm_dir=no
  
  echo $ac_n "checking for the location of libXpm""... $ac_c" 1>&6
 -echo "configure:36406: checking for the location of libXpm" >&5
-+echo "configure:37426: checking for the location of libXpm" >&5
++echo "configure:37768: checking for the location of libXpm" >&5
  # Check whether --with-xpm-dir or --without-xpm-dir was given.
  if test "${with_xpm_dir+set}" = set; then
    withval="$with_xpm_dir"
-@@ -36425,7 +37445,7 @@
+@@ -36425,7 +37787,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_with_freetype_dir=no
  
  echo $ac_n "checking for FreeType 2""... $ac_c" 1>&6
 -echo "configure:36429: checking for FreeType 2" >&5
-+echo "configure:37449: checking for FreeType 2" >&5
++echo "configure:37791: checking for FreeType 2" >&5
  # Check whether --with-freetype-dir or --without-freetype-dir was given.
  if test "${with_freetype_dir+set}" = set; then
    withval="$with_freetype_dir"
-@@ -36448,7 +37468,7 @@
+@@ -36448,7 +37810,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_with_t1lib=no
  
  echo $ac_n "checking for T1lib support""... $ac_c" 1>&6
 -echo "configure:36452: checking for T1lib support" >&5
-+echo "configure:37472: checking for T1lib support" >&5
++echo "configure:37814: checking for T1lib support" >&5
  # Check whether --with-t1lib or --without-t1lib was given.
  if test "${with_t1lib+set}" = set; then
    withval="$with_t1lib"
-@@ -36471,7 +37491,7 @@
+@@ -36471,7 +37833,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_enable_gd_native_ttf=no
  
  echo $ac_n "checking whether to enable truetype string function in GD""... $ac_c" 1>&6
 -echo "configure:36475: checking whether to enable truetype string function in GD" >&5
-+echo "configure:37495: checking whether to enable truetype string function in GD" >&5
++echo "configure:37837: checking whether to enable truetype string function in GD" >&5
  # Check whether --enable-gd-native-ttf or --disable-gd-native-ttf was given.
  if test "${enable_gd_native_ttf+set}" = set; then
    enableval="$enable_gd_native_ttf"
-@@ -36494,7 +37514,7 @@
+@@ -36494,7 +37856,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_enable_gd_jis_conv=no
  
  echo $ac_n "checking whether to enable JIS-mapped Japanese font support in GD""... $ac_c" 1>&6
 -echo "configure:36498: checking whether to enable JIS-mapped Japanese font support in GD" >&5
-+echo "configure:37518: checking whether to enable JIS-mapped Japanese font support in GD" >&5
++echo "configure:37860: checking whether to enable JIS-mapped Japanese font support in GD" >&5
  # Check whether --enable-gd-jis-conv or --disable-gd-jis-conv was given.
  if test "${enable_gd_jis_conv+set}" = set; then
    enableval="$enable_gd_jis_conv"
-@@ -36546,12 +37566,12 @@
+@@ -36546,12 +37908,12 @@ if test "$PHP_GD" = "yes"; then
    for ac_func in fabsf floorf
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:36550: checking for $ac_func" >&5
-+echo "configure:37570: checking for $ac_func" >&5
++echo "configure:37912: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 36555 "configure"
-+#line 37575 "configure"
++#line 37917 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -36574,7 +37594,7 @@
+@@ -36574,7 +37936,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:36578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:37598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:37940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -36746,7 +37766,7 @@
+@@ -36746,7 +38108,7 @@ EOF
    done
  
    echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
 -echo "configure:36750: checking for jpeg_read_header in -ljpeg" >&5
-+echo "configure:37770: checking for jpeg_read_header in -ljpeg" >&5
++echo "configure:38112: checking for jpeg_read_header in -ljpeg" >&5
  ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -36754,7 +37774,7 @@
+@@ -36754,7 +38116,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ljpeg  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 36758 "configure"
-+#line 37778 "configure"
++#line 38120 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -36765,7 +37785,7 @@
+@@ -36765,7 +38127,7 @@ int main() {
  jpeg_read_header()
  ; return 0; }
  EOF
 -if { (eval echo configure:36769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:37789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:38131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -37047,7 +38067,7 @@
+@@ -37047,7 +38409,7 @@ fi
    done
  
    echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6
 -echo "configure:37051: checking for png_write_image in -lpng" >&5
-+echo "configure:38071: checking for png_write_image in -lpng" >&5
++echo "configure:38413: checking for png_write_image in -lpng" >&5
  ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -37055,7 +38075,7 @@
+@@ -37055,7 +38417,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpng  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 37059 "configure"
-+#line 38079 "configure"
++#line 38421 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -37066,7 +38086,7 @@
+@@ -37066,7 +38428,7 @@ int main() {
  png_write_image()
  ; return 0; }
  EOF
 -if { (eval echo configure:37070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:38090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:38432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -37446,7 +38466,7 @@
+@@ -37446,7 +38808,7 @@ fi
    done
  
    echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6
 -echo "configure:37450: checking for XpmFreeXpmImage in -lXpm" >&5
-+echo "configure:38470: checking for XpmFreeXpmImage in -lXpm" >&5
++echo "configure:38812: checking for XpmFreeXpmImage in -lXpm" >&5
  ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -37454,7 +38474,7 @@
+@@ -37454,7 +38816,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lXpm  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 37458 "configure"
-+#line 38478 "configure"
++#line 38820 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -37465,7 +38485,7 @@
+@@ -37465,7 +38827,7 @@ int main() {
  XpmFreeXpmImage()
  ; return 0; }
  EOF
 -if { (eval echo configure:37469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:38489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:38831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -37840,7 +38860,7 @@
+@@ -37840,7 +39202,7 @@ fi
    done
  
    echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6
 -echo "configure:37844: checking for FT_New_Face in -lfreetype" >&5
-+echo "configure:38864: checking for FT_New_Face in -lfreetype" >&5
++echo "configure:39206: checking for FT_New_Face in -lfreetype" >&5
  ac_lib_var=`echo freetype'_'FT_New_Face | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -37848,7 +38868,7 @@
+@@ -37848,7 +39210,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lfreetype  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 37852 "configure"
-+#line 38872 "configure"
++#line 39214 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -37859,7 +38879,7 @@
+@@ -37859,7 +39221,7 @@ int main() {
  FT_New_Face()
  ; return 0; }
  EOF
 -if { (eval echo configure:37863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:38883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:39225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -38176,7 +39196,7 @@
+@@ -38176,7 +39538,7 @@ fi
    done
  
    echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6
 -echo "configure:38180: checking for T1_StrError in -lt1" >&5
-+echo "configure:39200: checking for T1_StrError in -lt1" >&5
++echo "configure:39542: checking for T1_StrError in -lt1" >&5
  ac_lib_var=`echo t1'_'T1_StrError | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -38184,7 +39204,7 @@
+@@ -38184,7 +39546,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lt1  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 38188 "configure"
-+#line 39208 "configure"
++#line 39550 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -38195,7 +39215,7 @@
+@@ -38195,7 +39557,7 @@ int main() {
  T1_StrError()
  ; return 0; }
  EOF
 -if { (eval echo configure:38199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:39219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:39561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -38638,7 +39658,7 @@
+@@ -38638,7 +40000,7 @@ EOF
    done
  
    echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
 -echo "configure:38642: checking for jpeg_read_header in -ljpeg" >&5
-+echo "configure:39662: checking for jpeg_read_header in -ljpeg" >&5
++echo "configure:40004: checking for jpeg_read_header in -ljpeg" >&5
  ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -38646,7 +39666,7 @@
+@@ -38646,7 +40008,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ljpeg  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 38650 "configure"
-+#line 39670 "configure"
++#line 40012 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -38657,7 +39677,7 @@
+@@ -38657,7 +40019,7 @@ int main() {
  jpeg_read_header()
  ; return 0; }
  EOF
 -if { (eval echo configure:38661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:39681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:40023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -38939,7 +39959,7 @@
+@@ -38939,7 +40301,7 @@ fi
    done
  
    echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6
 -echo "configure:38943: checking for png_write_image in -lpng" >&5
-+echo "configure:39963: checking for png_write_image in -lpng" >&5
++echo "configure:40305: checking for png_write_image in -lpng" >&5
  ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -38947,7 +39967,7 @@
+@@ -38947,7 +40309,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpng  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 38951 "configure"
-+#line 39971 "configure"
++#line 40313 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -38958,7 +39978,7 @@
+@@ -38958,7 +40320,7 @@ int main() {
  png_write_image()
  ; return 0; }
  EOF
 -if { (eval echo configure:38962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:39982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:40324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -39338,7 +40358,7 @@
+@@ -39338,7 +40700,7 @@ fi
    done
  
    echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6
 -echo "configure:39342: checking for XpmFreeXpmImage in -lXpm" >&5
-+echo "configure:40362: checking for XpmFreeXpmImage in -lXpm" >&5
++echo "configure:40704: checking for XpmFreeXpmImage in -lXpm" >&5
  ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -39346,7 +40366,7 @@
+@@ -39346,7 +40708,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lXpm  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 39350 "configure"
-+#line 40370 "configure"
++#line 40712 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -39357,7 +40377,7 @@
+@@ -39357,7 +40719,7 @@ int main() {
  XpmFreeXpmImage()
  ; return 0; }
  EOF
 -if { (eval echo configure:39361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:40381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:40723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -39732,7 +40752,7 @@
+@@ -39732,7 +41094,7 @@ fi
    done
  
    echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6
 -echo "configure:39736: checking for FT_New_Face in -lfreetype" >&5
-+echo "configure:40756: checking for FT_New_Face in -lfreetype" >&5
++echo "configure:41098: checking for FT_New_Face in -lfreetype" >&5
  ac_lib_var=`echo freetype'_'FT_New_Face | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -39740,7 +40760,7 @@
+@@ -39740,7 +41102,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lfreetype  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 39744 "configure"
-+#line 40764 "configure"
++#line 41106 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -39751,7 +40771,7 @@
+@@ -39751,7 +41113,7 @@ int main() {
  FT_New_Face()
  ; return 0; }
  EOF
 -if { (eval echo configure:39755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:40775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:41117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -40068,7 +41088,7 @@
+@@ -40068,7 +41430,7 @@ fi
    done
  
    echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6
 -echo "configure:40072: checking for T1_StrError in -lt1" >&5
-+echo "configure:41092: checking for T1_StrError in -lt1" >&5
++echo "configure:41434: checking for T1_StrError in -lt1" >&5
  ac_lib_var=`echo t1'_'T1_StrError | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -40076,7 +41096,7 @@
+@@ -40076,7 +41438,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lt1  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 40080 "configure"
-+#line 41100 "configure"
++#line 41442 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -40087,7 +41107,7 @@
+@@ -40087,7 +41449,7 @@ int main() {
  T1_StrError()
  ; return 0; }
  EOF
 -if { (eval echo configure:40091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:41111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:41453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -40462,7 +41482,7 @@
+@@ -40462,7 +41824,7 @@ EOF
    done
  
    echo $ac_n "checking for gdImageString16 in -lgd""... $ac_c" 1>&6
 -echo "configure:40466: checking for gdImageString16 in -lgd" >&5
-+echo "configure:41486: checking for gdImageString16 in -lgd" >&5
++echo "configure:41828: checking for gdImageString16 in -lgd" >&5
  ac_lib_var=`echo gd'_'gdImageString16 | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -40470,7 +41490,7 @@
+@@ -40470,7 +41832,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 40474 "configure"
-+#line 41494 "configure"
++#line 41836 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -40481,7 +41501,7 @@
+@@ -40481,7 +41843,7 @@ int main() {
  gdImageString16()
  ; return 0; }
  EOF
 -if { (eval echo configure:40485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:41505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:41847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -40610,7 +41630,7 @@
+@@ -40610,7 +41972,7 @@ fi
    done
  
    echo $ac_n "checking for gdImagePaletteCopy in -lgd""... $ac_c" 1>&6
 -echo "configure:40614: checking for gdImagePaletteCopy in -lgd" >&5
-+echo "configure:41634: checking for gdImagePaletteCopy in -lgd" >&5
++echo "configure:41976: checking for gdImagePaletteCopy in -lgd" >&5
  ac_lib_var=`echo gd'_'gdImagePaletteCopy | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -40618,7 +41638,7 @@
+@@ -40618,7 +41980,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 40622 "configure"
-+#line 41642 "configure"
++#line 41984 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -40629,7 +41649,7 @@
+@@ -40629,7 +41991,7 @@ int main() {
  gdImagePaletteCopy()
  ; return 0; }
  EOF
 -if { (eval echo configure:40633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:41653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:41995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -40758,7 +41778,7 @@
+@@ -40758,7 +42120,7 @@ fi
    done
  
    echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6
 -echo "configure:40762: checking for gdImageCreateFromPng in -lgd" >&5
-+echo "configure:41782: checking for gdImageCreateFromPng in -lgd" >&5
++echo "configure:42124: checking for gdImageCreateFromPng in -lgd" >&5
  ac_lib_var=`echo gd'_'gdImageCreateFromPng | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -40766,7 +41786,7 @@
+@@ -40766,7 +42128,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 40770 "configure"
-+#line 41790 "configure"
++#line 42132 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -40777,7 +41797,7 @@
+@@ -40777,7 +42139,7 @@ int main() {
  gdImageCreateFromPng()
  ; return 0; }
  EOF
 -if { (eval echo configure:40781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:41801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:42143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -40906,7 +41926,7 @@
+@@ -40906,7 +42268,7 @@ fi
    done
  
    echo $ac_n "checking for gdImageCreateFromGif in -lgd""... $ac_c" 1>&6
 -echo "configure:40910: checking for gdImageCreateFromGif in -lgd" >&5
-+echo "configure:41930: checking for gdImageCreateFromGif in -lgd" >&5
++echo "configure:42272: checking for gdImageCreateFromGif in -lgd" >&5
  ac_lib_var=`echo gd'_'gdImageCreateFromGif | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -40914,7 +41934,7 @@
+@@ -40914,7 +42276,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 40918 "configure"
-+#line 41938 "configure"
++#line 42280 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -40925,7 +41945,7 @@
+@@ -40925,7 +42287,7 @@ int main() {
  gdImageCreateFromGif()
  ; return 0; }
  EOF
 -if { (eval echo configure:40929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:41949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:42291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -41054,7 +42074,7 @@
+@@ -41054,7 +42416,7 @@ fi
    done
  
    echo $ac_n "checking for gdImageGif in -lgd""... $ac_c" 1>&6
 -echo "configure:41058: checking for gdImageGif in -lgd" >&5
-+echo "configure:42078: checking for gdImageGif in -lgd" >&5
++echo "configure:42420: checking for gdImageGif in -lgd" >&5
  ac_lib_var=`echo gd'_'gdImageGif | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -41062,7 +42082,7 @@
+@@ -41062,7 +42424,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 41066 "configure"
-+#line 42086 "configure"
++#line 42428 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -41073,7 +42093,7 @@
+@@ -41073,7 +42435,7 @@ int main() {
  gdImageGif()
  ; return 0; }
  EOF
 -if { (eval echo configure:41077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:42097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:42439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -41202,7 +42222,7 @@
+@@ -41202,7 +42564,7 @@ fi
    done
  
    echo $ac_n "checking for gdImageWBMP in -lgd""... $ac_c" 1>&6
 -echo "configure:41206: checking for gdImageWBMP in -lgd" >&5
-+echo "configure:42226: checking for gdImageWBMP in -lgd" >&5
++echo "configure:42568: checking for gdImageWBMP in -lgd" >&5
  ac_lib_var=`echo gd'_'gdImageWBMP | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -41210,7 +42230,7 @@
+@@ -41210,7 +42572,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 41214 "configure"
-+#line 42234 "configure"
++#line 42576 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -41221,7 +42241,7 @@
+@@ -41221,7 +42583,7 @@ int main() {
  gdImageWBMP()
  ; return 0; }
  EOF
 -if { (eval echo configure:41225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:42245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:42587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -41350,7 +42370,7 @@
+@@ -41350,7 +42712,7 @@ fi
    done
  
    echo $ac_n "checking for gdImageCreateFromJpeg in -lgd""... $ac_c" 1>&6
 -echo "configure:41354: checking for gdImageCreateFromJpeg in -lgd" >&5
-+echo "configure:42374: checking for gdImageCreateFromJpeg in -lgd" >&5
++echo "configure:42716: checking for gdImageCreateFromJpeg in -lgd" >&5
  ac_lib_var=`echo gd'_'gdImageCreateFromJpeg | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -41358,7 +42378,7 @@
+@@ -41358,7 +42720,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 41362 "configure"
-+#line 42382 "configure"
++#line 42724 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -41369,7 +42389,7 @@
+@@ -41369,7 +42731,7 @@ int main() {
  gdImageCreateFromJpeg()
  ; return 0; }
  EOF
 -if { (eval echo configure:41373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:42393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:42735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -41498,7 +42518,7 @@
+@@ -41498,7 +42860,7 @@ fi
    done
  
    echo $ac_n "checking for gdImageCreateFromXpm in -lgd""... $ac_c" 1>&6
 -echo "configure:41502: checking for gdImageCreateFromXpm in -lgd" >&5
-+echo "configure:42522: checking for gdImageCreateFromXpm in -lgd" >&5
++echo "configure:42864: checking for gdImageCreateFromXpm in -lgd" >&5
  ac_lib_var=`echo gd'_'gdImageCreateFromXpm | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -41506,7 +42526,7 @@
+@@ -41506,7 +42868,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 41510 "configure"
-+#line 42530 "configure"
++#line 42872 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -41517,7 +42537,7 @@
+@@ -41517,7 +42879,7 @@ int main() {
  gdImageCreateFromXpm()
  ; return 0; }
  EOF
 -if { (eval echo configure:41521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:42541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:42883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -41646,7 +42666,7 @@
+@@ -41646,7 +43008,7 @@ fi
    done
  
    echo $ac_n "checking for gdImageCreateFromGd2 in -lgd""... $ac_c" 1>&6
 -echo "configure:41650: checking for gdImageCreateFromGd2 in -lgd" >&5
-+echo "configure:42670: checking for gdImageCreateFromGd2 in -lgd" >&5
++echo "configure:43012: checking for gdImageCreateFromGd2 in -lgd" >&5
  ac_lib_var=`echo gd'_'gdImageCreateFromGd2 | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -41654,7 +42674,7 @@
+@@ -41654,7 +43016,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 41658 "configure"
-+#line 42678 "configure"
++#line 43020 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -41665,7 +42685,7 @@
+@@ -41665,7 +43027,7 @@ int main() {
  gdImageCreateFromGd2()
  ; return 0; }
  EOF
 -if { (eval echo configure:41669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:42689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:43031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -41794,7 +42814,7 @@
+@@ -41794,7 +43156,7 @@ fi
    done
  
    echo $ac_n "checking for gdImageCreateTrueColor in -lgd""... $ac_c" 1>&6
 -echo "configure:41798: checking for gdImageCreateTrueColor in -lgd" >&5
-+echo "configure:42818: checking for gdImageCreateTrueColor in -lgd" >&5
++echo "configure:43160: checking for gdImageCreateTrueColor in -lgd" >&5
  ac_lib_var=`echo gd'_'gdImageCreateTrueColor | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -41802,7 +42822,7 @@
+@@ -41802,7 +43164,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 41806 "configure"
-+#line 42826 "configure"
++#line 43168 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -41813,7 +42833,7 @@
+@@ -41813,7 +43175,7 @@ int main() {
  gdImageCreateTrueColor()
  ; return 0; }
  EOF
 -if { (eval echo configure:41817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:42837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:43179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -41942,7 +42962,7 @@
+@@ -41942,7 +43304,7 @@ fi
    done
  
    echo $ac_n "checking for gdImageSetTile in -lgd""... $ac_c" 1>&6
 -echo "configure:41946: checking for gdImageSetTile in -lgd" >&5
-+echo "configure:42966: checking for gdImageSetTile in -lgd" >&5
++echo "configure:43308: checking for gdImageSetTile in -lgd" >&5
  ac_lib_var=`echo gd'_'gdImageSetTile | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -41950,7 +42970,7 @@
+@@ -41950,7 +43312,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 41954 "configure"
-+#line 42974 "configure"
++#line 43316 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -41961,7 +42981,7 @@
+@@ -41961,7 +43323,7 @@ int main() {
  gdImageSetTile()
  ; return 0; }
  EOF
 -if { (eval echo configure:41965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:42985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:43327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -42090,7 +43110,7 @@
+@@ -42090,7 +43452,7 @@ fi
    done
  
    echo $ac_n "checking for gdImageEllipse in -lgd""... $ac_c" 1>&6
 -echo "configure:42094: checking for gdImageEllipse in -lgd" >&5
-+echo "configure:43114: checking for gdImageEllipse in -lgd" >&5
++echo "configure:43456: checking for gdImageEllipse in -lgd" >&5
  ac_lib_var=`echo gd'_'gdImageEllipse | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -42098,7 +43118,7 @@
+@@ -42098,7 +43460,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 42102 "configure"
-+#line 43122 "configure"
++#line 43464 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -42109,7 +43129,7 @@
+@@ -42109,7 +43471,7 @@ int main() {
  gdImageEllipse()
  ; return 0; }
  EOF
 -if { (eval echo configure:42113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:43133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:43475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -42238,7 +43258,7 @@
+@@ -42238,7 +43600,7 @@ fi
    done
  
    echo $ac_n "checking for gdImageSetBrush in -lgd""... $ac_c" 1>&6
 -echo "configure:42242: checking for gdImageSetBrush in -lgd" >&5
-+echo "configure:43262: checking for gdImageSetBrush in -lgd" >&5
++echo "configure:43604: checking for gdImageSetBrush in -lgd" >&5
  ac_lib_var=`echo gd'_'gdImageSetBrush | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -42246,7 +43266,7 @@
+@@ -42246,7 +43608,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 42250 "configure"
-+#line 43270 "configure"
++#line 43612 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -42257,7 +43277,7 @@
+@@ -42257,7 +43619,7 @@ int main() {
  gdImageSetBrush()
  ; return 0; }
  EOF
 -if { (eval echo configure:42261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:43281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:43623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -42386,7 +43406,7 @@
+@@ -42386,7 +43748,7 @@ fi
    done
  
    echo $ac_n "checking for gdImageStringTTF in -lgd""... $ac_c" 1>&6
 -echo "configure:42390: checking for gdImageStringTTF in -lgd" >&5
-+echo "configure:43410: checking for gdImageStringTTF in -lgd" >&5
++echo "configure:43752: checking for gdImageStringTTF in -lgd" >&5
  ac_lib_var=`echo gd'_'gdImageStringTTF | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -42394,7 +43414,7 @@
+@@ -42394,7 +43756,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 42398 "configure"
-+#line 43418 "configure"
++#line 43760 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -42405,7 +43425,7 @@
+@@ -42405,7 +43767,7 @@ int main() {
  gdImageStringTTF()
  ; return 0; }
  EOF
 -if { (eval echo configure:42409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:43429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:43771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -42534,7 +43554,7 @@
+@@ -42534,7 +43896,7 @@ fi
    done
  
    echo $ac_n "checking for gdImageStringFT in -lgd""... $ac_c" 1>&6
 -echo "configure:42538: checking for gdImageStringFT in -lgd" >&5
-+echo "configure:43558: checking for gdImageStringFT in -lgd" >&5
++echo "configure:43900: checking for gdImageStringFT in -lgd" >&5
  ac_lib_var=`echo gd'_'gdImageStringFT | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -42542,7 +43562,7 @@
+@@ -42542,7 +43904,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 42546 "configure"
-+#line 43566 "configure"
++#line 43908 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -42553,7 +43573,7 @@
+@@ -42553,7 +43915,7 @@ int main() {
  gdImageStringFT()
  ; return 0; }
  EOF
 -if { (eval echo configure:42557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:43577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:43919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -42682,7 +43702,7 @@
+@@ -42682,7 +44044,7 @@ fi
    done
  
    echo $ac_n "checking for gdImageStringFTEx in -lgd""... $ac_c" 1>&6
 -echo "configure:42686: checking for gdImageStringFTEx in -lgd" >&5
-+echo "configure:43706: checking for gdImageStringFTEx in -lgd" >&5
++echo "configure:44048: checking for gdImageStringFTEx in -lgd" >&5
  ac_lib_var=`echo gd'_'gdImageStringFTEx | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -42690,7 +43710,7 @@
+@@ -42690,7 +44052,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 42694 "configure"
-+#line 43714 "configure"
++#line 44056 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -42701,7 +43721,7 @@
+@@ -42701,7 +44063,7 @@ int main() {
  gdImageStringFTEx()
  ; return 0; }
  EOF
 -if { (eval echo configure:42705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:43725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:44067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -42830,7 +43850,7 @@
+@@ -42830,7 +44192,7 @@ fi
    done
  
    echo $ac_n "checking for gdImageColorClosestHWB in -lgd""... $ac_c" 1>&6
 -echo "configure:42834: checking for gdImageColorClosestHWB in -lgd" >&5
-+echo "configure:43854: checking for gdImageColorClosestHWB in -lgd" >&5
++echo "configure:44196: checking for gdImageColorClosestHWB in -lgd" >&5
  ac_lib_var=`echo gd'_'gdImageColorClosestHWB | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -42838,7 +43858,7 @@
+@@ -42838,7 +44200,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 42842 "configure"
-+#line 43862 "configure"
++#line 44204 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -42849,7 +43869,7 @@
+@@ -42849,7 +44211,7 @@ int main() {
  gdImageColorClosestHWB()
  ; return 0; }
  EOF
 -if { (eval echo configure:42853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:43873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:44215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -42978,7 +43998,7 @@
+@@ -42978,7 +44340,7 @@ fi
    done
  
    echo $ac_n "checking for gdImageColorResolve in -lgd""... $ac_c" 1>&6
 -echo "configure:42982: checking for gdImageColorResolve in -lgd" >&5
-+echo "configure:44002: checking for gdImageColorResolve in -lgd" >&5
++echo "configure:44344: checking for gdImageColorResolve in -lgd" >&5
  ac_lib_var=`echo gd'_'gdImageColorResolve | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -42986,7 +44006,7 @@
+@@ -42986,7 +44348,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 42990 "configure"
-+#line 44010 "configure"
++#line 44352 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -42997,7 +44017,7 @@
+@@ -42997,7 +44359,7 @@ int main() {
  gdImageColorResolve()
  ; return 0; }
  EOF
 -if { (eval echo configure:43001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:44021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:44363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -43126,7 +44146,7 @@
+@@ -43126,7 +44488,7 @@ fi
    done
  
    echo $ac_n "checking for gdImageGifCtx in -lgd""... $ac_c" 1>&6
 -echo "configure:43130: checking for gdImageGifCtx in -lgd" >&5
-+echo "configure:44150: checking for gdImageGifCtx in -lgd" >&5
++echo "configure:44492: checking for gdImageGifCtx in -lgd" >&5
  ac_lib_var=`echo gd'_'gdImageGifCtx | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -43134,7 +44154,7 @@
+@@ -43134,7 +44496,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 43138 "configure"
-+#line 44158 "configure"
++#line 44500 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -43145,7 +44165,7 @@
+@@ -43145,7 +44507,7 @@ int main() {
  gdImageGifCtx()
  ; return 0; }
  EOF
 -if { (eval echo configure:43149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:44169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:44511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -43274,7 +44294,7 @@
+@@ -43274,7 +44636,7 @@ fi
    done
  
    echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6
 -echo "configure:43278: checking for gdCacheCreate in -lgd" >&5
-+echo "configure:44298: checking for gdCacheCreate in -lgd" >&5
++echo "configure:44640: checking for gdCacheCreate in -lgd" >&5
  ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -43282,7 +44302,7 @@
+@@ -43282,7 +44644,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 43286 "configure"
-+#line 44306 "configure"
++#line 44648 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -43293,7 +44313,7 @@
+@@ -43293,7 +44655,7 @@ int main() {
  gdCacheCreate()
  ; return 0; }
  EOF
 -if { (eval echo configure:43297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:44317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:44659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -43422,7 +44442,7 @@
+@@ -43422,7 +44784,7 @@ fi
    done
  
    echo $ac_n "checking for gdFontCacheShutdown in -lgd""... $ac_c" 1>&6
 -echo "configure:43426: checking for gdFontCacheShutdown in -lgd" >&5
-+echo "configure:44446: checking for gdFontCacheShutdown in -lgd" >&5
++echo "configure:44788: checking for gdFontCacheShutdown in -lgd" >&5
  ac_lib_var=`echo gd'_'gdFontCacheShutdown | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -43430,7 +44450,7 @@
+@@ -43430,7 +44792,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 43434 "configure"
-+#line 44454 "configure"
++#line 44796 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -43441,7 +44461,7 @@
+@@ -43441,7 +44803,7 @@ int main() {
  gdFontCacheShutdown()
  ; return 0; }
  EOF
 -if { (eval echo configure:43445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:44465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:44807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -43570,7 +44590,7 @@
+@@ -43570,7 +44932,7 @@ fi
    done
  
    echo $ac_n "checking for gdFreeFontCache in -lgd""... $ac_c" 1>&6
 -echo "configure:43574: checking for gdFreeFontCache in -lgd" >&5
-+echo "configure:44594: checking for gdFreeFontCache in -lgd" >&5
++echo "configure:44936: checking for gdFreeFontCache in -lgd" >&5
  ac_lib_var=`echo gd'_'gdFreeFontCache | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -43578,7 +44598,7 @@
+@@ -43578,7 +44940,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 43582 "configure"
-+#line 44602 "configure"
++#line 44944 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -43589,7 +44609,7 @@
+@@ -43589,7 +44951,7 @@ int main() {
  gdFreeFontCache()
  ; return 0; }
  EOF
 -if { (eval echo configure:43593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:44613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:44955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -43718,7 +44738,7 @@
+@@ -43718,7 +45080,7 @@ fi
    done
  
    echo $ac_n "checking for gdFontCacheMutexSetup in -lgd""... $ac_c" 1>&6
 -echo "configure:43722: checking for gdFontCacheMutexSetup in -lgd" >&5
-+echo "configure:44742: checking for gdFontCacheMutexSetup in -lgd" >&5
++echo "configure:45084: checking for gdFontCacheMutexSetup in -lgd" >&5
  ac_lib_var=`echo gd'_'gdFontCacheMutexSetup | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -43726,7 +44746,7 @@
+@@ -43726,7 +45088,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 43730 "configure"
-+#line 44750 "configure"
++#line 45092 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -43737,7 +44757,7 @@
+@@ -43737,7 +45099,7 @@ int main() {
  gdFontCacheMutexSetup()
  ; return 0; }
  EOF
 -if { (eval echo configure:43741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:44761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:45103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -43866,7 +44886,7 @@
+@@ -43866,7 +45228,7 @@ fi
    done
  
    echo $ac_n "checking for gdNewDynamicCtxEx in -lgd""... $ac_c" 1>&6
 -echo "configure:43870: checking for gdNewDynamicCtxEx in -lgd" >&5
-+echo "configure:44890: checking for gdNewDynamicCtxEx in -lgd" >&5
++echo "configure:45232: checking for gdNewDynamicCtxEx in -lgd" >&5
  ac_lib_var=`echo gd'_'gdNewDynamicCtxEx | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -43874,7 +44894,7 @@
+@@ -43874,7 +45236,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 43878 "configure"
-+#line 44898 "configure"
++#line 45240 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -43885,7 +44905,7 @@
+@@ -43885,7 +45247,7 @@ int main() {
  gdNewDynamicCtxEx()
  ; return 0; }
  EOF
 -if { (eval echo configure:43889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:44909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:45251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -43940,7 +44960,7 @@
+@@ -43940,7 +45302,7 @@ fi
          old_CPPFLAGS=$CPPFLAGS
    CPPFLAGS=-I$GD_INCLUDE
    cat > conftest.$ac_ext <<EOF
 -#line 43944 "configure"
-+#line 44964 "configure"
++#line 45306 "configure"
  #include "confdefs.h"
  
  #include <gd.h>
-@@ -43954,7 +44974,7 @@
+@@ -43954,7 +45316,7 @@ ctx->gd_free = 1;
    
  ; return 0; }
  EOF
 -if { (eval echo configure:43958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:44978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:45320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      cat >> confdefs.h <<\EOF
-@@ -44285,7 +45305,7 @@
+@@ -44285,7 +45647,7 @@ EOF
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 44289 "configure"
-+#line 45309 "configure"
++#line 45651 "configure"
  #include "confdefs.h"
  
      char foobar () {}
-@@ -44296,7 +45316,7 @@
+@@ -44296,7 +45658,7 @@ else
      }
    
  EOF
 -if { (eval echo configure:44300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:45320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:45662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      LIBS=$old_LIBS
-@@ -44447,7 +45467,7 @@
+@@ -44447,7 +45809,7 @@ fi
    done
  
    echo $ac_n "checking for gdImageCreate in -lgd""... $ac_c" 1>&6
 -echo "configure:44451: checking for gdImageCreate in -lgd" >&5
-+echo "configure:45471: checking for gdImageCreate in -lgd" >&5
++echo "configure:45813: checking for gdImageCreate in -lgd" >&5
  ac_lib_var=`echo gd'_'gdImageCreate | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -44455,7 +45475,7 @@
+@@ -44455,7 +45817,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 44459 "configure"
-+#line 45479 "configure"
++#line 45821 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -44466,7 +45486,7 @@
+@@ -44466,7 +45828,7 @@ int main() {
  gdImageCreate()
  ; return 0; }
  EOF
 -if { (eval echo configure:44470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:45490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:45832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -44531,7 +45551,7 @@
+@@ -44531,7 +45893,7 @@ fi
  php_with_gettext=no
  
  echo $ac_n "checking for GNU gettext support""... $ac_c" 1>&6
 -echo "configure:44535: checking for GNU gettext support" >&5
-+echo "configure:45555: checking for GNU gettext support" >&5
++echo "configure:45897: checking for GNU gettext support" >&5
  # Check whether --with-gettext or --without-gettext was given.
  if test "${with_gettext+set}" = set; then
    withval="$with_gettext"
-@@ -44586,7 +45606,7 @@
+@@ -44586,7 +45948,7 @@ if test "$PHP_GETTEXT" != "no"; then
    O_LDFLAGS=$LDFLAGS
    LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR"
    echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
 -echo "configure:44590: checking for bindtextdomain in -lintl" >&5
-+echo "configure:45610: checking for bindtextdomain in -lintl" >&5
++echo "configure:45952: checking for bindtextdomain in -lintl" >&5
  ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -44594,7 +45614,7 @@
+@@ -44594,7 +45956,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lintl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 44598 "configure"
-+#line 45618 "configure"
++#line 45960 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -44605,7 +45625,7 @@
+@@ -44605,7 +45967,7 @@ int main() {
  bindtextdomain()
  ; return 0; }
  EOF
 -if { (eval echo configure:44609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:45629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:45971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -44627,7 +45647,7 @@
+@@ -44627,7 +45989,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for bindtextdomain in -lc""... $ac_c" 1>&6
 -echo "configure:44631: checking for bindtextdomain in -lc" >&5
-+echo "configure:45651: checking for bindtextdomain in -lc" >&5
++echo "configure:45993: checking for bindtextdomain in -lc" >&5
  ac_lib_var=`echo c'_'bindtextdomain | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -44635,7 +45655,7 @@
+@@ -44635,7 +45997,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lc  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 44639 "configure"
-+#line 45659 "configure"
++#line 46001 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -44646,7 +45666,7 @@
+@@ -44646,7 +46008,7 @@ int main() {
  bindtextdomain()
  ; return 0; }
  EOF
 -if { (eval echo configure:44650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:45670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:46012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -45110,7 +46130,7 @@
+@@ -45110,7 +46472,7 @@ EOF
  
  
    echo $ac_n "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
 -echo "configure:45114: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
-+echo "configure:46134: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
++echo "configure:46476: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
  ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'ngettext | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -45118,7 +46138,7 @@
+@@ -45118,7 +46480,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 45122 "configure"
-+#line 46142 "configure"
++#line 46484 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -45129,7 +46149,7 @@
+@@ -45129,7 +46491,7 @@ int main() {
  ngettext()
  ; return 0; }
  EOF
 -if { (eval echo configure:45133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:46153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:46495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -45153,7 +46173,7 @@
+@@ -45153,7 +46515,7 @@ else
  fi
  
    echo $ac_n "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
 -echo "configure:45157: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
-+echo "configure:46177: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
++echo "configure:46519: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
  ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dngettext | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -45161,7 +46181,7 @@
+@@ -45161,7 +46523,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 45165 "configure"
-+#line 46185 "configure"
++#line 46527 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -45172,7 +46192,7 @@
+@@ -45172,7 +46534,7 @@ int main() {
  dngettext()
  ; return 0; }
  EOF
 -if { (eval echo configure:45176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:46196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:46538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -45196,7 +46216,7 @@
+@@ -45196,7 +46558,7 @@ else
  fi
  
    echo $ac_n "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
 -echo "configure:45200: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
-+echo "configure:46220: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
++echo "configure:46562: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
  ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dcngettext | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -45204,7 +46224,7 @@
+@@ -45204,7 +46566,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 45208 "configure"
-+#line 46228 "configure"
++#line 46570 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -45215,7 +46235,7 @@
+@@ -45215,7 +46577,7 @@ int main() {
  dcngettext()
  ; return 0; }
  EOF
 -if { (eval echo configure:45219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:46239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:46581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -45239,7 +46259,7 @@
+@@ -45239,7 +46601,7 @@ else
  fi
  
    echo $ac_n "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6
 -echo "configure:45243: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
-+echo "configure:46263: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
++echo "configure:46605: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
  ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'bind_textdomain_codeset | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -45247,7 +46267,7 @@
+@@ -45247,7 +46609,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 45251 "configure"
-+#line 46271 "configure"
++#line 46613 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -45258,7 +46278,7 @@
+@@ -45258,7 +46620,7 @@ int main() {
  bind_textdomain_codeset()
  ; return 0; }
  EOF
 -if { (eval echo configure:45262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:46282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:46624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -45289,7 +46309,7 @@
+@@ -45289,7 +46651,7 @@ fi
  php_with_gmp=no
  
  echo $ac_n "checking for GNU MP support""... $ac_c" 1>&6
 -echo "configure:45293: checking for GNU MP support" >&5
-+echo "configure:46313: checking for GNU MP support" >&5
++echo "configure:46655: checking for GNU MP support" >&5
  # Check whether --with-gmp or --without-gmp was given.
  if test "${with_gmp+set}" = set; then
    withval="$with_gmp"
-@@ -45437,7 +46457,7 @@
+@@ -45437,7 +46799,7 @@ if test "$PHP_GMP" != "no"; then
    done
  
    echo $ac_n "checking for __gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6
 -echo "configure:45441: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5
-+echo "configure:46461: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5
++echo "configure:46803: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5
  ac_lib_var=`echo gmp'_'__gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -45445,7 +46465,7 @@
+@@ -45445,7 +46807,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgmp  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 45449 "configure"
-+#line 46469 "configure"
++#line 46811 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -45456,7 +46476,7 @@
+@@ -45456,7 +46818,7 @@ int main() {
  __gmp_randinit_lc_2exp_size()
  ; return 0; }
  EOF
 -if { (eval echo configure:45460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:46480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:46822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -45581,7 +46601,7 @@
+@@ -45581,7 +46943,7 @@ else
    done
  
    echo $ac_n "checking for gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6
 -echo "configure:45585: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5
-+echo "configure:46605: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5
++echo "configure:46947: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5
  ac_lib_var=`echo gmp'_'gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -45589,7 +46609,7 @@
+@@ -45589,7 +46951,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgmp  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 45593 "configure"
-+#line 46613 "configure"
++#line 46955 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -45600,7 +46620,7 @@
+@@ -45600,7 +46962,7 @@ int main() {
  gmp_randinit_lc_2exp_size()
  ; return 0; }
  EOF
 -if { (eval echo configure:45604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:46624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:46966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -46072,7 +47092,7 @@
+@@ -46072,7 +47434,7 @@ fi
  php_with_mhash=no
  
  echo $ac_n "checking for mhash support""... $ac_c" 1>&6
 -echo "configure:46076: checking for mhash support" >&5
-+echo "configure:47096: checking for mhash support" >&5
++echo "configure:47438: checking for mhash support" >&5
  # Check whether --with-mhash or --without-mhash was given.
  if test "${with_mhash+set}" = set; then
    withval="$with_mhash"
-@@ -46116,7 +47136,7 @@
+@@ -46116,7 +47478,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_enable_hash=yes
  
  echo $ac_n "checking whether to enable hash support""... $ac_c" 1>&6
 -echo "configure:46120: checking whether to enable hash support" >&5
-+echo "configure:47140: checking whether to enable hash support" >&5
++echo "configure:47482: checking whether to enable hash support" >&5
  # Check whether --enable-hash or --disable-hash was given.
  if test "${enable_hash+set}" = set; then
    enableval="$enable_hash"
-@@ -46174,7 +47194,7 @@
+@@ -46174,7 +47536,7 @@ EOF
  
  
    echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
 -echo "configure:46178: checking whether byte ordering is bigendian" >&5
-+echo "configure:47198: checking whether byte ordering is bigendian" >&5
++echo "configure:47540: checking whether byte ordering is bigendian" >&5
  if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -46184,7 +47204,7 @@
+@@ -46184,7 +47546,7 @@ else
    ac_cv_c_bigendian_php=unknown
  else
    cat > conftest.$ac_ext <<EOF
 -#line 46188 "configure"
-+#line 47208 "configure"
++#line 47550 "configure"
  #include "confdefs.h"
  
  int main(void)
-@@ -46200,7 +47220,7 @@
+@@ -46200,7 +47562,7 @@ int main(void)
  }
    
  EOF
 -if { (eval echo configure:46204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:47224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:47566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_bigendian_php=yes
  else
-@@ -46225,7 +47245,7 @@
+@@ -46225,7 +47587,7 @@ EOF
  
  
    echo $ac_n "checking size of short""... $ac_c" 1>&6
 -echo "configure:46229: checking size of short" >&5
-+echo "configure:47249: checking size of short" >&5
++echo "configure:47591: checking size of short" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -46233,18 +47253,19 @@
+@@ -46233,18 +47595,19 @@ else
    ac_cv_sizeof_short=2
  else
    cat > conftest.$ac_ext <<EOF
 -#line 46237 "configure"
-+#line 47257 "configure"
++#line 47599 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -8427,25 +8779,25 @@
  }
  EOF
 -if { (eval echo configure:46248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:47269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:47611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_short=`cat conftestval`
  else
-@@ -46264,7 +47285,7 @@
+@@ -46264,7 +47627,7 @@ EOF
  
  
    echo $ac_n "checking size of int""... $ac_c" 1>&6
 -echo "configure:46268: checking size of int" >&5
-+echo "configure:47289: checking size of int" >&5
++echo "configure:47631: checking size of int" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -46272,18 +47293,19 @@
+@@ -46272,18 +47635,19 @@ else
    ac_cv_sizeof_int=4
  else
    cat > conftest.$ac_ext <<EOF
 -#line 46276 "configure"
-+#line 47297 "configure"
++#line 47639 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -8461,25 +8813,25 @@
  }
  EOF
 -if { (eval echo configure:46287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:47309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:47651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_int=`cat conftestval`
  else
-@@ -46303,7 +47325,7 @@
+@@ -46303,7 +47667,7 @@ EOF
  
  
    echo $ac_n "checking size of long""... $ac_c" 1>&6
 -echo "configure:46307: checking size of long" >&5
-+echo "configure:47329: checking size of long" >&5
++echo "configure:47671: checking size of long" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -46311,18 +47333,19 @@
+@@ -46311,18 +47675,19 @@ else
    ac_cv_sizeof_long=4
  else
    cat > conftest.$ac_ext <<EOF
 -#line 46315 "configure"
-+#line 47337 "configure"
++#line 47679 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -8495,25 +8847,25 @@
  }
  EOF
 -if { (eval echo configure:46326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:47349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:47691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_long=`cat conftestval`
  else
-@@ -46342,7 +47365,7 @@
+@@ -46342,7 +47707,7 @@ EOF
  
  
    echo $ac_n "checking size of long long""... $ac_c" 1>&6
 -echo "configure:46346: checking size of long long" >&5
-+echo "configure:47369: checking size of long long" >&5
++echo "configure:47711: checking size of long long" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -46350,18 +47373,19 @@
+@@ -46350,18 +47715,19 @@ else
    ac_cv_sizeof_long_long=8
  else
    cat > conftest.$ac_ext <<EOF
 -#line 46354 "configure"
-+#line 47377 "configure"
++#line 47719 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -8529,130 +8881,130 @@
  }
  EOF
 -if { (eval echo configure:46365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:47389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:47731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_long_long=`cat conftestval`
  else
-@@ -46710,7 +47734,7 @@
+@@ -46710,7 +48076,7 @@ fi
  php_with_iconv=yes
  
  echo $ac_n "checking for iconv support""... $ac_c" 1>&6
 -echo "configure:46714: checking for iconv support" >&5
-+echo "configure:47738: checking for iconv support" >&5
++echo "configure:48080: checking for iconv support" >&5
  # Check whether --with-iconv or --without-iconv was given.
  if test "${with_iconv+set}" = set; then
    withval="$with_iconv"
-@@ -46771,12 +47795,12 @@
+@@ -46771,12 +48137,12 @@ if test "$PHP_ICONV" != "no"; then
  
          if test "$PHP_ICONV" = "yes"; then
      echo $ac_n "checking for iconv""... $ac_c" 1>&6
 -echo "configure:46775: checking for iconv" >&5
-+echo "configure:47799: checking for iconv" >&5
++echo "configure:48141: checking for iconv" >&5
  if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 46780 "configure"
-+#line 47804 "configure"
++#line 48146 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char iconv(); below.  */
-@@ -46799,7 +47823,7 @@
+@@ -46799,7 +48165,7 @@ iconv();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:46803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:47827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:48169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_iconv=yes"
  else
-@@ -46820,12 +47844,12 @@
+@@ -46820,12 +48186,12 @@ else
    echo "$ac_t""no" 1>&6
  
        echo $ac_n "checking for libiconv""... $ac_c" 1>&6
 -echo "configure:46824: checking for libiconv" >&5
-+echo "configure:47848: checking for libiconv" >&5
++echo "configure:48190: checking for libiconv" >&5
  if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 46829 "configure"
-+#line 47853 "configure"
++#line 48195 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char libiconv(); below.  */
-@@ -46848,7 +47872,7 @@
+@@ -46848,7 +48214,7 @@ libiconv();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:46852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:47876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:48218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_libiconv=yes"
  else
-@@ -47004,7 +48028,7 @@
+@@ -47004,7 +48370,7 @@ EOF
    done
  
    echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
 -echo "configure:47008: checking for libiconv in -l$iconv_lib_name" >&5
-+echo "configure:48032: checking for libiconv in -l$iconv_lib_name" >&5
++echo "configure:48374: checking for libiconv in -l$iconv_lib_name" >&5
  ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -47012,7 +48036,7 @@
+@@ -47012,7 +48378,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$iconv_lib_name  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 47016 "configure"
-+#line 48040 "configure"
++#line 48382 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -47023,7 +48047,7 @@
+@@ -47023,7 +48389,7 @@ int main() {
  libiconv()
  ; return 0; }
  EOF
 -if { (eval echo configure:47027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:48051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:48393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -47164,7 +48188,7 @@
+@@ -47164,7 +48530,7 @@ else
    done
  
    echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
 -echo "configure:47168: checking for iconv in -l$iconv_lib_name" >&5
-+echo "configure:48192: checking for iconv in -l$iconv_lib_name" >&5
++echo "configure:48534: checking for iconv in -l$iconv_lib_name" >&5
  ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -47172,7 +48196,7 @@
+@@ -47172,7 +48538,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$iconv_lib_name  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 47176 "configure"
-+#line 48200 "configure"
++#line 48542 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -47183,7 +48207,7 @@
+@@ -47183,7 +48549,7 @@ int main() {
  iconv()
  ; return 0; }
  EOF
 -if { (eval echo configure:47187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:48211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:48553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -47394,16 +48418,16 @@
+@@ -47394,16 +48760,16 @@ else
      fi 
  
      echo $ac_n "checking if iconv is glibc's""... $ac_c" 1>&6
 -echo "configure:47398: checking if iconv is glibc's" >&5
-+echo "configure:48422: checking if iconv is glibc's" >&5
++echo "configure:48764: checking if iconv is glibc's" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 47400 "configure"
-+#line 48424 "configure"
++#line 48766 "configure"
  #include "confdefs.h"
  #include <gnu/libc-version.h>
  int main() {
@@ -8660,46 +9012,46 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:47407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:48431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:48773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    
        echo "$ac_t""yes" 1>&6
-@@ -47421,7 +48445,7 @@
+@@ -47421,7 +48787,7 @@ rm -f conftest*
  
      if test -z "$iconv_impl_name"; then
        echo $ac_n "checking if using GNU libiconv""... $ac_c" 1>&6
 -echo "configure:47425: checking if using GNU libiconv" >&5
-+echo "configure:48449: checking if using GNU libiconv" >&5
++echo "configure:48791: checking if using GNU libiconv" >&5
        php_iconv_old_ld="$LDFLAGS"
        LDFLAGS="-liconv $LDFLAGS"
        if test "$cross_compiling" = yes; then
-@@ -47431,7 +48455,7 @@
+@@ -47431,7 +48797,7 @@ echo "configure:47425: checking if using GNU libiconv" >&5
        
  else
    cat > conftest.$ac_ext <<EOF
 -#line 47435 "configure"
-+#line 48459 "configure"
++#line 48801 "configure"
  #include "confdefs.h"
  
  #include <$PHP_ICONV_H_PATH>
-@@ -47441,7 +48465,7 @@
+@@ -47441,7 +48807,7 @@ int main() {
  }
        
  EOF
 -if { (eval echo configure:47445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:48469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:48811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
          echo "$ac_t""yes" 1>&6
-@@ -47463,16 +48487,16 @@
+@@ -47463,16 +48829,16 @@ fi
  
      if test -z "$iconv_impl_name"; then
        echo $ac_n "checking if iconv is Konstantin Chuguev's""... $ac_c" 1>&6
 -echo "configure:47467: checking if iconv is Konstantin Chuguev's" >&5
-+echo "configure:48491: checking if iconv is Konstantin Chuguev's" >&5
++echo "configure:48833: checking if iconv is Konstantin Chuguev's" >&5
        cat > conftest.$ac_ext <<EOF
 -#line 47469 "configure"
-+#line 48493 "configure"
++#line 48835 "configure"
  #include "confdefs.h"
  #include <iconv.h>
  int main() {
@@ -8707,21 +9059,21 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:47476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:48500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:48842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    
          echo "$ac_t""yes" 1>&6
-@@ -47491,18 +48515,18 @@
+@@ -47491,18 +48857,18 @@ rm -f conftest*
  
      if test -z "$iconv_impl_name"; then
        echo $ac_n "checking if using IBM iconv""... $ac_c" 1>&6
 -echo "configure:47495: checking if using IBM iconv" >&5
-+echo "configure:48519: checking if using IBM iconv" >&5
++echo "configure:48861: checking if using IBM iconv" >&5
        php_iconv_old_ld="$LDFLAGS"
        LDFLAGS="-liconv $LDFLAGS"
        cat > conftest.$ac_ext <<EOF
 -#line 47499 "configure"
-+#line 48523 "configure"
++#line 48865 "configure"
  #include "confdefs.h"
  #include <iconv.h>
  int main() {
@@ -8729,590 +9081,590 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:47506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:48530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:48872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    
          echo "$ac_t""yes" 1>&6
-@@ -47688,7 +48712,7 @@
+@@ -47688,7 +49054,7 @@ EOF
      esac
  
      echo $ac_n "checking if iconv supports errno""... $ac_c" 1>&6
 -echo "configure:47692: checking if iconv supports errno" >&5
-+echo "configure:48716: checking if iconv supports errno" >&5
++echo "configure:49058: checking if iconv supports errno" >&5
      if test "$cross_compiling" = yes; then
    
        echo "$ac_t""no" 1>&6
-@@ -47702,7 +48726,7 @@
+@@ -47702,7 +49068,7 @@ EOF
      
  else
    cat > conftest.$ac_ext <<EOF
 -#line 47706 "configure"
-+#line 48730 "configure"
++#line 49072 "configure"
  #include "confdefs.h"
  
  #include <$PHP_ICONV_H_PATH>
-@@ -47723,7 +48747,7 @@
+@@ -47723,7 +49089,7 @@ int main() {
  }
      
  EOF
 -if { (eval echo configure:47727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:48751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:49093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
        echo "$ac_t""yes" 1>&6
-@@ -47755,9 +48779,9 @@
+@@ -47755,9 +49121,9 @@ fi
  
  
      echo $ac_n "checking if your cpp allows macro usage in include lines""... $ac_c" 1>&6
 -echo "configure:47759: checking if your cpp allows macro usage in include lines" >&5
-+echo "configure:48783: checking if your cpp allows macro usage in include lines" >&5
++echo "configure:49125: checking if your cpp allows macro usage in include lines" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 47761 "configure"
-+#line 48785 "configure"
++#line 49127 "configure"
  #include "confdefs.h"
  
  #define FOO <$PHP_ICONV_H_PATH>
-@@ -47767,7 +48791,7 @@
+@@ -47767,7 +49133,7 @@ int main() {
  
  ; return 0; }
  EOF
 -if { (eval echo configure:47771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:48795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:49137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
        echo "$ac_t""yes" 1>&6
-@@ -48123,7 +49147,7 @@
+@@ -48123,7 +49489,7 @@ fi
  php_with_imap=no
  
  echo $ac_n "checking for IMAP support""... $ac_c" 1>&6
 -echo "configure:48127: checking for IMAP support" >&5
-+echo "configure:49151: checking for IMAP support" >&5
++echo "configure:49493: checking for IMAP support" >&5
  # Check whether --with-imap or --without-imap was given.
  if test "${with_imap+set}" = set; then
    withval="$with_imap"
-@@ -48167,7 +49191,7 @@
+@@ -48167,7 +49533,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_with_kerberos=no
  
  echo $ac_n "checking for IMAP Kerberos support""... $ac_c" 1>&6
 -echo "configure:48171: checking for IMAP Kerberos support" >&5
-+echo "configure:49195: checking for IMAP Kerberos support" >&5
++echo "configure:49537: checking for IMAP Kerberos support" >&5
  # Check whether --with-kerberos or --without-kerberos was given.
  if test "${with_kerberos+set}" = set; then
    withval="$with_kerberos"
-@@ -48190,7 +49214,7 @@
+@@ -48190,7 +49556,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_with_imap_ssl=no
  
  echo $ac_n "checking for IMAP SSL support""... $ac_c" 1>&6
 -echo "configure:48194: checking for IMAP SSL support" >&5
-+echo "configure:49218: checking for IMAP SSL support" >&5
++echo "configure:49560: checking for IMAP SSL support" >&5
  # Check whether --with-imap-ssl or --without-imap-ssl was given.
  if test "${with_imap_ssl+set}" = set; then
    withval="$with_imap_ssl"
-@@ -48594,7 +49618,7 @@
+@@ -48594,7 +49960,7 @@ EOF
      done
  
          cat > conftest.$ac_ext <<EOF
 -#line 48598 "configure"
-+#line 49622 "configure"
++#line 49964 "configure"
  #include "confdefs.h"
  #include <$IMAP_INC_DIR/mail.h>
  EOF
-@@ -48614,12 +49638,12 @@
+@@ -48614,12 +49980,12 @@ rm -f conftest*
          old_CFLAGS=$CFLAGS
      CFLAGS="-I$IMAP_INC_DIR"
      echo $ac_n "checking for utf8_mime2text signature""... $ac_c" 1>&6
 -echo "configure:48618: checking for utf8_mime2text signature" >&5
-+echo "configure:49642: checking for utf8_mime2text signature" >&5
++echo "configure:49984: checking for utf8_mime2text signature" >&5
  if eval "test \"`echo '$''{'ac_cv_utf8_mime2text'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 48623 "configure"
-+#line 49647 "configure"
++#line 49989 "configure"
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -48632,7 +49656,7 @@
+@@ -48632,7 +49998,7 @@ int main() {
        
  ; return 0; }
  EOF
 -if { (eval echo configure:48636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:49660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:50002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
          ac_cv_utf8_mime2text=old
-@@ -48661,12 +49685,12 @@
+@@ -48661,12 +50027,12 @@ EOF
      old_CFLAGS=$CFLAGS
      CFLAGS="-I$IMAP_INC_DIR"
      echo $ac_n "checking for U8T_DECOMPOSE""... $ac_c" 1>&6
 -echo "configure:48665: checking for U8T_DECOMPOSE" >&5
-+echo "configure:49689: checking for U8T_DECOMPOSE" >&5
++echo "configure:50031: checking for U8T_DECOMPOSE" >&5
  if eval "test \"`echo '$''{'ac_cv_u8t_canonical'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 48670 "configure"
-+#line 49694 "configure"
++#line 50036 "configure"
  #include "confdefs.h"
  
  #include <c-client.h>
-@@ -48677,7 +49701,7 @@
+@@ -48677,7 +50043,7 @@ int main() {
        
  ; return 0; }
  EOF
 -if { (eval echo configure:48681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:49705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:50047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
           ac_cv_u8t_decompose=yes
-@@ -48707,7 +49731,7 @@
+@@ -48707,7 +50073,7 @@ echo "$ac_t""$ac_cv_u8t_canonical" 1>&6
          old_CPPFLAGS=$CPPFLAGS
      CPPFLAGS=-I$IMAP_INC_DIR
      cat > conftest.$ac_ext <<EOF
 -#line 48711 "configure"
-+#line 49735 "configure"
++#line 50077 "configure"
  #include "confdefs.h"
  
  #include "imap4r1.h"
-@@ -48826,7 +49850,7 @@
+@@ -48826,7 +50192,7 @@ rm -f conftest*
    done
  
    echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6
 -echo "configure:48830: checking for pam_start in -lpam" >&5
-+echo "configure:49854: checking for pam_start in -lpam" >&5
++echo "configure:50196: checking for pam_start in -lpam" >&5
  ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -48834,7 +49858,7 @@
+@@ -48834,7 +50200,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpam  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 48838 "configure"
-+#line 49862 "configure"
++#line 50204 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -48845,7 +49869,7 @@
+@@ -48845,7 +50211,7 @@ int main() {
  pam_start()
  ; return 0; }
  EOF
 -if { (eval echo configure:48849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:49873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:50215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -49000,7 +50024,7 @@
+@@ -49000,7 +50366,7 @@ fi
    done
  
    echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
 -echo "configure:49004: checking for crypt in -lcrypt" >&5
-+echo "configure:50028: checking for crypt in -lcrypt" >&5
++echo "configure:50370: checking for crypt in -lcrypt" >&5
  ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -49008,7 +50032,7 @@
+@@ -49008,7 +50374,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lcrypt  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 49012 "configure"
-+#line 50036 "configure"
++#line 50378 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -49019,7 +50043,7 @@
+@@ -49019,7 +50385,7 @@ int main() {
  crypt()
  ; return 0; }
  EOF
 -if { (eval echo configure:49023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:50047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:50389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -49223,7 +50247,7 @@
+@@ -49223,7 +50589,7 @@ fi
      # Extract the first word of "krb5-config", so it can be a program name with args.
  set dummy krb5-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:49227: checking for $ac_word" >&5
-+echo "configure:50251: checking for $ac_word" >&5
++echo "configure:50593: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -49592,7 +50616,7 @@
+@@ -49592,7 +50958,7 @@ else
  
    else
      cat > conftest.$ac_ext <<EOF
 -#line 49596 "configure"
-+#line 50620 "configure"
++#line 50962 "configure"
  #include "confdefs.h"
  #include <$IMAP_INC_DIR/linkage.h>
  EOF
-@@ -49633,7 +50657,7 @@
+@@ -49633,7 +50999,7 @@ rm -f conftest*
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:49637: checking for $ac_word" >&5
-+echo "configure:50661: checking for $ac_word" >&5
++echo "configure:51003: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -49838,9 +50862,9 @@
+@@ -49838,9 +51204,9 @@ fi
      old_CPPFLAGS=$CPPFLAGS
      CPPFLAGS=-I$OPENSSL_INCDIR
      echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
 -echo "configure:49842: checking for OpenSSL version" >&5
-+echo "configure:50866: checking for OpenSSL version" >&5
++echo "configure:51208: checking for OpenSSL version" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 49844 "configure"
-+#line 50868 "configure"
++#line 51210 "configure"
  #include "confdefs.h"
  
  #include <openssl/opensslv.h>
-@@ -49995,7 +51019,7 @@
+@@ -49995,7 +51361,7 @@ rm -f conftest*
    done
  
    echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
 -echo "configure:49999: checking for CRYPTO_free in -lcrypto" >&5
-+echo "configure:51023: checking for CRYPTO_free in -lcrypto" >&5
++echo "configure:51365: checking for CRYPTO_free in -lcrypto" >&5
  ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -50003,7 +51027,7 @@
+@@ -50003,7 +51369,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lcrypto  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 50007 "configure"
-+#line 51031 "configure"
++#line 51373 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -50014,7 +51038,7 @@
+@@ -50014,7 +51380,7 @@ int main() {
  CRYPTO_free()
  ; return 0; }
  EOF
 -if { (eval echo configure:50018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:51042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:51384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -50171,7 +51195,7 @@
+@@ -50171,7 +51537,7 @@ fi
    done
  
    echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
 -echo "configure:50175: checking for SSL_CTX_set_ssl_version in -lssl" >&5
-+echo "configure:51199: checking for SSL_CTX_set_ssl_version in -lssl" >&5
++echo "configure:51541: checking for SSL_CTX_set_ssl_version in -lssl" >&5
  ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -50179,7 +51203,7 @@
+@@ -50179,7 +51545,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lssl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 50183 "configure"
-+#line 51207 "configure"
++#line 51549 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -50190,7 +51214,7 @@
+@@ -50190,7 +51556,7 @@ int main() {
  SSL_CTX_set_ssl_version()
  ; return 0; }
  EOF
 -if { (eval echo configure:50194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:51218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:51560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -50309,7 +51333,7 @@
+@@ -50309,7 +51675,7 @@ else
  
    elif test -f "$IMAP_INC_DIR/linkage.c"; then
      cat > conftest.$ac_ext <<EOF
 -#line 50313 "configure"
-+#line 51337 "configure"
++#line 51679 "configure"
  #include "confdefs.h"
  #include <$IMAP_INC_DIR/linkage.c>
  EOF
-@@ -50340,7 +51364,7 @@
+@@ -50340,7 +51706,7 @@ rm -f conftest*
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 50344 "configure"
-+#line 51368 "configure"
++#line 51710 "configure"
  #include "confdefs.h"
  
      
-@@ -50373,7 +51397,7 @@
+@@ -50373,7 +51739,7 @@ else
      }
    
  EOF
 -if { (eval echo configure:50377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:51401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:51743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      LIBS=$old_LIBS
-@@ -50409,7 +51433,7 @@
+@@ -50409,7 +51775,7 @@ fi
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 50413 "configure"
-+#line 51437 "configure"
++#line 51779 "configure"
  #include "confdefs.h"
  
      
-@@ -50442,7 +51466,7 @@
+@@ -50442,7 +51808,7 @@ else
      }
    
  EOF
 -if { (eval echo configure:50446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:51470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:51812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      LIBS=$old_LIBS
-@@ -50469,7 +51493,7 @@
+@@ -50469,7 +51835,7 @@ fi
  
  
      echo $ac_n "checking whether rfc822_output_address_list function present""... $ac_c" 1>&6
 -echo "configure:50473: checking whether rfc822_output_address_list function present" >&5
-+echo "configure:51497: checking whether rfc822_output_address_list function present" >&5
++echo "configure:51839: checking whether rfc822_output_address_list function present" >&5
      
    old_LIBS=$LIBS
    LIBS="
-@@ -50481,7 +51505,7 @@
+@@ -50481,7 +51847,7 @@ echo "configure:50473: checking whether rfc822_output_address_list function pres
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 50485 "configure"
-+#line 51509 "configure"
++#line 51851 "configure"
  #include "confdefs.h"
  
      
-@@ -50517,7 +51541,7 @@
+@@ -50517,7 +51883,7 @@ else
      }
    
  EOF
 -if { (eval echo configure:50521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:51545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:51887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      LIBS=$old_LIBS
-@@ -50546,7 +51570,7 @@
+@@ -50546,7 +51912,7 @@ fi
  
  
      echo $ac_n "checking whether build with IMAP works""... $ac_c" 1>&6
 -echo "configure:50550: checking whether build with IMAP works" >&5
-+echo "configure:51574: checking whether build with IMAP works" >&5
++echo "configure:51916: checking whether build with IMAP works" >&5
      
    
    old_LIBS=$LIBS
-@@ -50557,7 +51581,7 @@
+@@ -50557,7 +51923,7 @@ echo "configure:50550: checking whether build with IMAP works" >&5
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 50561 "configure"
-+#line 51585 "configure"
++#line 51927 "configure"
  #include "confdefs.h"
  
      
-@@ -50590,7 +51614,7 @@
+@@ -50590,7 +51956,7 @@ else
      }
    
  EOF
 -if { (eval echo configure:50594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:51618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:51960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      LIBS=$old_LIBS
-@@ -50622,7 +51646,7 @@
+@@ -50622,7 +51988,7 @@ fi
  php_with_interbase=no
  
  echo $ac_n "checking for InterBase support""... $ac_c" 1>&6
 -echo "configure:50626: checking for InterBase support" >&5
-+echo "configure:51650: checking for InterBase support" >&5
++echo "configure:51992: checking for InterBase support" >&5
  # Check whether --with-interbase or --without-interbase was given.
  if test "${with_interbase+set}" = set; then
    withval="$with_interbase"
-@@ -50769,7 +51793,7 @@
+@@ -50769,7 +52135,7 @@ if test "$PHP_INTERBASE" != "no"; then
    done
  
    echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6
 -echo "configure:50773: checking for isc_detach_database in -lfbclient" >&5
-+echo "configure:51797: checking for isc_detach_database in -lfbclient" >&5
++echo "configure:52139: checking for isc_detach_database in -lfbclient" >&5
  ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -50777,7 +51801,7 @@
+@@ -50777,7 +52143,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lfbclient  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 50781 "configure"
-+#line 51805 "configure"
++#line 52147 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -50788,7 +51812,7 @@
+@@ -50788,7 +52154,7 @@ int main() {
  isc_detach_database()
  ; return 0; }
  EOF
 -if { (eval echo configure:50792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:51816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:52158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -50915,7 +51939,7 @@
+@@ -50915,7 +52281,7 @@ else
    done
  
    echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6
 -echo "configure:50919: checking for isc_detach_database in -lgds" >&5
-+echo "configure:51943: checking for isc_detach_database in -lgds" >&5
++echo "configure:52285: checking for isc_detach_database in -lgds" >&5
  ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -50923,7 +51947,7 @@
+@@ -50923,7 +52289,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgds  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 50927 "configure"
-+#line 51951 "configure"
++#line 52293 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -50934,7 +51958,7 @@
+@@ -50934,7 +52300,7 @@ int main() {
  isc_detach_database()
  ; return 0; }
  EOF
 -if { (eval echo configure:50938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:51962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:52304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -51061,7 +52085,7 @@
+@@ -51061,7 +52427,7 @@ else
    done
  
    echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6
 -echo "configure:51065: checking for isc_detach_database in -lib_util" >&5
-+echo "configure:52089: checking for isc_detach_database in -lib_util" >&5
++echo "configure:52431: checking for isc_detach_database in -lib_util" >&5
  ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -51069,7 +52093,7 @@
+@@ -51069,7 +52435,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lib_util  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 51073 "configure"
-+#line 52097 "configure"
++#line 52439 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -51080,7 +52104,7 @@
+@@ -51080,7 +52446,7 @@ int main() {
  isc_detach_database()
  ; return 0; }
  EOF
 -if { (eval echo configure:51084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:52108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:52450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -51557,7 +52581,7 @@
+@@ -51557,7 +52923,7 @@ fi
  php_enable_intl=no
  
  echo $ac_n "checking whether to enable internationalization support""... $ac_c" 1>&6
 -echo "configure:51561: checking whether to enable internationalization support" >&5
-+echo "configure:52585: checking whether to enable internationalization support" >&5
++echo "configure:52927: checking whether to enable internationalization support" >&5
  # Check whether --enable-intl or --disable-intl was given.
  if test "${enable_intl+set}" = set; then
    enableval="$enable_intl"
-@@ -51629,7 +52653,7 @@
+@@ -51629,7 +52995,7 @@ ext_output=$PHP_ICU_DIR
          # Extract the first word of "icu-config", so it can be a program name with args.
  set dummy icu-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:51633: checking for $ac_word" >&5
-+echo "configure:52657: checking for $ac_word" >&5
++echo "configure:52999: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_ICU_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -51667,7 +52691,7 @@
+@@ -51667,7 +53033,7 @@ fi
    fi
  
    echo $ac_n "checking for location of ICU headers and libraries""... $ac_c" 1>&6
 -echo "configure:51671: checking for location of ICU headers and libraries" >&5
-+echo "configure:52695: checking for location of ICU headers and libraries" >&5
++echo "configure:53037: checking for location of ICU headers and libraries" >&5
  
      icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null`
    if test "$?" != "0" || test -z "$icu_install_prefix"; then
-@@ -51677,7 +52701,7 @@
+@@ -51677,7 +53043,7 @@ echo "configure:51671: checking for location of ICU headers and libraries" >&5
      echo "$ac_t""$icu_install_prefix" 1>&6
  
          echo $ac_n "checking for ICU 3.4 or greater""... $ac_c" 1>&6
 -echo "configure:51681: checking for ICU 3.4 or greater" >&5
-+echo "configure:52705: checking for ICU 3.4 or greater" >&5
++echo "configure:53047: checking for ICU 3.4 or greater" >&5
      icu_version_full=`$ICU_CONFIG --version`
      ac_IFS=$IFS
      IFS="."
-@@ -51834,7 +52858,7 @@
+@@ -51834,7 +53200,7 @@ do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:51838: checking for $ac_word" >&5
-+echo "configure:52862: checking for $ac_word" >&5
++echo "configure:53204: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -51866,7 +52890,7 @@
+@@ -51866,7 +53232,7 @@ test -n "$CXX" || CXX="gcc"
  
  
  echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
 -echo "configure:51870: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-+echo "configure:52894: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
++echo "configure:53236: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
  
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -51877,12 +52901,12 @@
+@@ -51877,12 +53243,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
  
  cat > conftest.$ac_ext << EOF
  
 -#line 51881 "configure"
-+#line 52905 "configure"
++#line 53247 "configure"
  #include "confdefs.h"
  
  int main(){return(0);}
  EOF
 -if { (eval echo configure:51886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:52910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:53252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    ac_cv_prog_cxx_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
-@@ -51908,12 +52932,12 @@
+@@ -51908,12 +53274,12 @@ if test $ac_cv_prog_cxx_works = no; then
    { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
  fi
  echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
 -echo "configure:51912: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:52936: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:53278: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
  cross_compiling=$ac_cv_prog_cxx_cross
  
  echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
 -echo "configure:51917: checking whether we are using GNU C++" >&5
-+echo "configure:52941: checking whether we are using GNU C++" >&5
++echo "configure:53283: checking whether we are using GNU C++" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -51922,7 +52946,7 @@
+@@ -51922,7 +53288,7 @@ else
    yes;
  #endif
  EOF
 -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:51926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:52950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:53292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gxx=yes
  else
    ac_cv_prog_gxx=no
-@@ -51941,7 +52965,7 @@
+@@ -51941,7 +53307,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
  ac_save_CXXFLAGS="$CXXFLAGS"
  CXXFLAGS=
  echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
 -echo "configure:51945: checking whether ${CXX-g++} accepts -g" >&5
-+echo "configure:52969: checking whether ${CXX-g++} accepts -g" >&5
++echo "configure:53311: checking whether ${CXX-g++} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -51972,59 +52996,8 @@
+@@ -51972,59 +53338,8 @@ else
    fi
  fi
  
@@ -9369,124 +9721,124 @@
 -
      echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
 -echo "configure:52028: checking how to run the C++ preprocessor" >&5
-+echo "configure:53001: checking how to run the C++ preprocessor" >&5
++echo "configure:53343: checking how to run the C++ preprocessor" >&5
  if test -z "$CXXCPP"; then
  if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -52037,12 +53010,12 @@
+@@ -52037,12 +53352,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
  cross_compiling=$ac_cv_prog_cxx_cross
    CXXCPP="${CXX-g++} -E"
    cat > conftest.$ac_ext <<EOF
 -#line 52041 "configure"
-+#line 53014 "configure"
++#line 53356 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:52046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:53019: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:53361: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
-@@ -52600,7 +53573,7 @@
+@@ -52600,7 +53915,7 @@ fi
  php_enable_json=yes
  
  echo $ac_n "checking whether to enable JavaScript Object Serialization support""... $ac_c" 1>&6
 -echo "configure:52604: checking whether to enable JavaScript Object Serialization support" >&5
-+echo "configure:53577: checking whether to enable JavaScript Object Serialization support" >&5
++echo "configure:53919: checking whether to enable JavaScript Object Serialization support" >&5
  # Check whether --enable-json or --disable-json was given.
  if test "${enable_json+set}" = set; then
    enableval="$enable_json"
-@@ -52646,12 +53619,12 @@
+@@ -52646,12 +53961,12 @@ if test "$PHP_JSON" != "no"; then
  EOF
  
    echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
 -echo "configure:52650: checking for ANSI C header files" >&5
-+echo "configure:53623: checking for ANSI C header files" >&5
++echo "configure:53965: checking for ANSI C header files" >&5
  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 52655 "configure"
-+#line 53628 "configure"
++#line 53970 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -52659,7 +53632,7 @@
+@@ -52659,7 +53974,7 @@ else
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:52663: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:53636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:53978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -52676,7 +53649,7 @@
+@@ -52676,7 +53991,7 @@ rm -f conftest*
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
 -#line 52680 "configure"
-+#line 53653 "configure"
++#line 53995 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
-@@ -52694,7 +53667,7 @@
+@@ -52694,7 +54009,7 @@ fi
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
 -#line 52698 "configure"
-+#line 53671 "configure"
++#line 54013 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
-@@ -52715,7 +53688,7 @@
+@@ -52715,7 +54030,7 @@ if test "$cross_compiling" = yes; then
    :
  else
    cat > conftest.$ac_ext <<EOF
 -#line 52719 "configure"
-+#line 53692 "configure"
++#line 54034 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -52726,7 +53699,7 @@
+@@ -52726,7 +54041,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
  exit (0); }
  
  EOF
 -if { (eval echo configure:52730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:53703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:54045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
-@@ -53076,7 +54049,7 @@
+@@ -53076,7 +54391,7 @@ fi
  php_with_ldap=no
  
  echo $ac_n "checking for LDAP support""... $ac_c" 1>&6
 -echo "configure:53080: checking for LDAP support" >&5
-+echo "configure:54053: checking for LDAP support" >&5
++echo "configure:54395: checking for LDAP support" >&5
  # Check whether --with-ldap or --without-ldap was given.
  if test "${with_ldap+set}" = set; then
    withval="$with_ldap"
-@@ -53120,7 +54093,7 @@
+@@ -53120,7 +54435,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_with_ldap_sasl=no
  
  echo $ac_n "checking for LDAP Cyrus SASL support""... $ac_c" 1>&6
 -echo "configure:53124: checking for LDAP Cyrus SASL support" >&5
-+echo "configure:54097: checking for LDAP Cyrus SASL support" >&5
++echo "configure:54439: checking for LDAP Cyrus SASL support" >&5
  # Check whether --with-ldap-sasl or --without-ldap-sasl was given.
  if test "${with_ldap_sasl+set}" = set; then
    withval="$with_ldap_sasl"
-@@ -55462,19 +56435,19 @@
+@@ -55462,19 +56777,19 @@ EOF
    LIBS="$LIBS $LDAP_SHARED_LIBADD"
  
      echo $ac_n "checking for 3 arg ldap_set_rebind_proc""... $ac_c" 1>&6
 -echo "configure:55466: checking for 3 arg ldap_set_rebind_proc" >&5
-+echo "configure:56439: checking for 3 arg ldap_set_rebind_proc" >&5
++echo "configure:56781: checking for 3 arg ldap_set_rebind_proc" >&5
  if eval "test \"`echo '$''{'ac_cv_3arg_setrebindproc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 55471 "configure"
-+#line 56444 "configure"
++#line 56786 "configure"
  #include "confdefs.h"
  #include <ldap.h>
  int main() {
@@ -9494,193 +9846,193 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:55478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:56451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:56793: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_3arg_setrebindproc=yes
  else
-@@ -55497,12 +56470,12 @@
+@@ -55497,12 +56812,12 @@ EOF
        for ac_func in ldap_parse_result ldap_parse_reference ldap_start_tls_s
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:55501: checking for $ac_func" >&5
-+echo "configure:56474: checking for $ac_func" >&5
++echo "configure:56816: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 55506 "configure"
-+#line 56479 "configure"
++#line 56821 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -55525,7 +56498,7 @@
+@@ -55525,7 +56840,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:55529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:56502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:56844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -55687,7 +56660,7 @@
+@@ -55687,7 +57002,7 @@ EOF
    done
  
    echo $ac_n "checking for sasl_version in -lldap""... $ac_c" 1>&6
 -echo "configure:55691: checking for sasl_version in -lldap" >&5
-+echo "configure:56664: checking for sasl_version in -lldap" >&5
++echo "configure:57006: checking for sasl_version in -lldap" >&5
  ac_lib_var=`echo ldap'_'sasl_version | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -55695,7 +56668,7 @@
+@@ -55695,7 +57010,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lldap  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 55699 "configure"
-+#line 56672 "configure"
++#line 57014 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -55706,7 +56679,7 @@
+@@ -55706,7 +57021,7 @@ int main() {
  sasl_version()
  ; return 0; }
  EOF
 -if { (eval echo configure:55710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:56683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:57025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -55875,12 +56848,12 @@
+@@ -55875,12 +57190,12 @@ fi
    fi
  
          echo $ac_n "checking for ldap_bind_s""... $ac_c" 1>&6
 -echo "configure:55879: checking for ldap_bind_s" >&5
-+echo "configure:56852: checking for ldap_bind_s" >&5
++echo "configure:57194: checking for ldap_bind_s" >&5
  if eval "test \"`echo '$''{'ac_cv_func_ldap_bind_s'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 55884 "configure"
-+#line 56857 "configure"
++#line 57199 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char ldap_bind_s(); below.  */
-@@ -55903,7 +56876,7 @@
+@@ -55903,7 +57218,7 @@ ldap_bind_s();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:55907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:56880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:57222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_ldap_bind_s=yes"
  else
-@@ -55956,7 +56929,7 @@
+@@ -55956,7 +57271,7 @@ fi
  php_enable_mbstring=no
  
  echo $ac_n "checking whether to enable multibyte string support""... $ac_c" 1>&6
 -echo "configure:55960: checking whether to enable multibyte string support" >&5
-+echo "configure:56933: checking whether to enable multibyte string support" >&5
++echo "configure:57275: checking whether to enable multibyte string support" >&5
  # Check whether --enable-mbstring or --disable-mbstring was given.
  if test "${enable_mbstring+set}" = set; then
    enableval="$enable_mbstring"
-@@ -56000,7 +56973,7 @@
+@@ -56000,7 +57315,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_enable_mbregex=yes
  
  echo $ac_n "checking whether to enable multibyte regex support""... $ac_c" 1>&6
 -echo "configure:56004: checking whether to enable multibyte regex support" >&5
-+echo "configure:56977: checking whether to enable multibyte regex support" >&5
++echo "configure:57319: checking whether to enable multibyte regex support" >&5
  # Check whether --enable-mbregex or --disable-mbregex was given.
  if test "${enable_mbregex+set}" = set; then
    enableval="$enable_mbregex"
-@@ -56023,7 +56996,7 @@
+@@ -56023,7 +57338,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_enable_mbregex_backtrack=yes
  
  echo $ac_n "checking whether to check multibyte regex backtrack""... $ac_c" 1>&6
 -echo "configure:56027: checking whether to check multibyte regex backtrack" >&5
-+echo "configure:57000: checking whether to check multibyte regex backtrack" >&5
++echo "configure:57342: checking whether to check multibyte regex backtrack" >&5
  # Check whether --enable-mbregex_backtrack or --disable-mbregex_backtrack was given.
  if test "${enable_mbregex_backtrack+set}" = set; then
    enableval="$enable_mbregex_backtrack"
-@@ -56046,7 +57019,7 @@
+@@ -56046,7 +57361,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_with_libmbfl=no
  
  echo $ac_n "checking for external libmbfl""... $ac_c" 1>&6
 -echo "configure:56050: checking for external libmbfl" >&5
-+echo "configure:57023: checking for external libmbfl" >&5
++echo "configure:57365: checking for external libmbfl" >&5
  # Check whether --with-libmbfl or --without-libmbfl was given.
  if test "${with_libmbfl+set}" = set; then
    withval="$with_libmbfl"
-@@ -56069,7 +57042,7 @@
+@@ -56069,7 +57384,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_with_onig=no
  
  echo $ac_n "checking for external oniguruma""... $ac_c" 1>&6
 -echo "configure:56073: checking for external oniguruma" >&5
-+echo "configure:57046: checking for external oniguruma" >&5
++echo "configure:57388: checking for external oniguruma" >&5
  # Check whether --with-onig or --without-onig was given.
  if test "${with_onig+set}" = set; then
    withval="$with_onig"
-@@ -56110,7 +57083,7 @@
+@@ -56110,7 +57425,7 @@ EOF
        fi
  
        echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6
 -echo "configure:56114: checking for variable length prototypes and stdarg.h" >&5
-+echo "configure:57087: checking for variable length prototypes and stdarg.h" >&5
++echo "configure:57429: checking for variable length prototypes and stdarg.h" >&5
  if eval "test \"`echo '$''{'php_cv_mbstring_stdarg'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -56128,7 +57101,7 @@
+@@ -56128,7 +57443,7 @@ else
          
  else
    cat > conftest.$ac_ext <<EOF
 -#line 56132 "configure"
-+#line 57105 "configure"
++#line 57447 "configure"
  #include "confdefs.h"
  
  #include <stdarg.h>
-@@ -56143,7 +57116,7 @@
+@@ -56143,7 +57458,7 @@ int foo(int x, ...) {
  int main() { return foo(10, "", 3.14); }
          
  EOF
 -if { (eval echo configure:56147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:57120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:57462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    php_cv_mbstring_stdarg=yes
  else
-@@ -56164,17 +57137,17 @@
+@@ -56164,17 +57479,17 @@ echo "$ac_t""$php_cv_mbstring_stdarg" 1>&6
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:56168: checking for $ac_hdr" >&5
-+echo "configure:57141: checking for $ac_hdr" >&5
++echo "configure:57483: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 56173 "configure"
-+#line 57146 "configure"
++#line 57488 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:56178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:57151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:57493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -56201,7 +57174,7 @@
+@@ -56201,7 +57516,7 @@ fi
  done
  
        echo $ac_n "checking size of int""... $ac_c" 1>&6
 -echo "configure:56205: checking size of int" >&5
-+echo "configure:57178: checking size of int" >&5
++echo "configure:57520: checking size of int" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -56209,18 +57182,19 @@
+@@ -56209,18 +57524,19 @@ else
    ac_cv_sizeof_int=4
  else
    cat > conftest.$ac_ext <<EOF
 -#line 56213 "configure"
-+#line 57186 "configure"
++#line 57528 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -9696,25 +10048,25 @@
  }
  EOF
 -if { (eval echo configure:56224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:57198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:57540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_int=`cat conftestval`
  else
-@@ -56240,7 +57214,7 @@
+@@ -56240,7 +57556,7 @@ EOF
  
  
        echo $ac_n "checking size of short""... $ac_c" 1>&6
 -echo "configure:56244: checking size of short" >&5
-+echo "configure:57218: checking size of short" >&5
++echo "configure:57560: checking size of short" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -56248,18 +57222,19 @@
+@@ -56248,18 +57564,19 @@ else
    ac_cv_sizeof_short=2
  else
    cat > conftest.$ac_ext <<EOF
 -#line 56252 "configure"
-+#line 57226 "configure"
++#line 57568 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -9730,25 +10082,25 @@
  }
  EOF
 -if { (eval echo configure:56263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:57238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:57580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_short=`cat conftestval`
  else
-@@ -56279,7 +57254,7 @@
+@@ -56279,7 +57596,7 @@ EOF
  
  
        echo $ac_n "checking size of long""... $ac_c" 1>&6
 -echo "configure:56283: checking size of long" >&5
-+echo "configure:57258: checking size of long" >&5
++echo "configure:57600: checking size of long" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -56287,18 +57262,19 @@
+@@ -56287,18 +57604,19 @@ else
    ac_cv_sizeof_long=4
  else
    cat > conftest.$ac_ext <<EOF
 -#line 56291 "configure"
-+#line 57266 "configure"
++#line 57608 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -9764,70 +10116,70 @@
  }
  EOF
 -if { (eval echo configure:56302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:57278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:57620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_long=`cat conftestval`
  else
-@@ -56318,12 +57294,12 @@
+@@ -56318,12 +57636,12 @@ EOF
  
  
        echo $ac_n "checking for working const""... $ac_c" 1>&6
 -echo "configure:56322: checking for working const" >&5
-+echo "configure:57298: checking for working const" >&5
++echo "configure:57640: checking for working const" >&5
  if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 56327 "configure"
-+#line 57303 "configure"
++#line 57645 "configure"
  #include "confdefs.h"
  
  int main() {
-@@ -56372,7 +57348,7 @@
+@@ -56372,7 +57690,7 @@ ccp = (char const *const *) p;
  
  ; return 0; }
  EOF
 -if { (eval echo configure:56376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:57352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:57694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_const=yes
  else
-@@ -56393,12 +57369,12 @@
+@@ -56393,12 +57711,12 @@ EOF
  fi
  
        echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
 -echo "configure:56397: checking whether time.h and sys/time.h may both be included" >&5
-+echo "configure:57373: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:57715: checking whether time.h and sys/time.h may both be included" >&5
  if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 56402 "configure"
-+#line 57378 "configure"
++#line 57720 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/time.h>
-@@ -56407,7 +57383,7 @@
+@@ -56407,7 +57725,7 @@ int main() {
  struct tm *tp;
  ; return 0; }
  EOF
 -if { (eval echo configure:56411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:57387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:57729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_header_time=yes
  else
-@@ -56430,19 +57406,19 @@
+@@ -56430,19 +57748,19 @@ fi
        # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
  # for constant arguments.  Useless!
  echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
 -echo "configure:56434: checking for working alloca.h" >&5
-+echo "configure:57410: checking for working alloca.h" >&5
++echo "configure:57752: checking for working alloca.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 56439 "configure"
-+#line 57415 "configure"
++#line 57757 "configure"
  #include "confdefs.h"
  #include <alloca.h>
  int main() {
@@ -9835,583 +10187,583 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:56446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:57422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:57764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_header_alloca_h=yes
  else
-@@ -56463,12 +57439,12 @@
+@@ -56463,12 +57781,12 @@ EOF
  fi
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
 -echo "configure:56467: checking for alloca" >&5
-+echo "configure:57443: checking for alloca" >&5
++echo "configure:57785: checking for alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 56472 "configure"
-+#line 57448 "configure"
++#line 57790 "configure"
  #include "confdefs.h"
  
  #ifdef __GNUC__
-@@ -56496,7 +57472,7 @@
+@@ -56496,7 +57814,7 @@ int main() {
  char *p = (char *) alloca(1);
  ; return 0; }
  EOF
 -if { (eval echo configure:56500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:57476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:57818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_func_alloca_works=yes
  else
-@@ -56528,12 +57504,12 @@
+@@ -56528,12 +57846,12 @@ EOF
  
  
  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
 -echo "configure:56532: checking whether alloca needs Cray hooks" >&5
-+echo "configure:57508: checking whether alloca needs Cray hooks" >&5
++echo "configure:57850: checking whether alloca needs Cray hooks" >&5
  if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 56537 "configure"
-+#line 57513 "configure"
++#line 57855 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
  webecray
-@@ -56558,12 +57534,12 @@
+@@ -56558,12 +57876,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
  if test $ac_cv_os_cray = yes; then
  for ac_func in _getb67 GETB67 getb67; do
    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:56562: checking for $ac_func" >&5
-+echo "configure:57538: checking for $ac_func" >&5
++echo "configure:57880: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 56567 "configure"
-+#line 57543 "configure"
++#line 57885 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -56586,7 +57562,7 @@
+@@ -56586,7 +57904,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:56590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:57566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:57908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -56613,7 +57589,7 @@
+@@ -56613,7 +57931,7 @@ done
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
 -echo "configure:56617: checking stack direction for C alloca" >&5
-+echo "configure:57593: checking stack direction for C alloca" >&5
++echo "configure:57935: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -56621,7 +57597,7 @@
+@@ -56621,7 +57939,7 @@ else
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
 -#line 56625 "configure"
-+#line 57601 "configure"
++#line 57943 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
-@@ -56640,7 +57616,7 @@
+@@ -56640,7 +57958,7 @@ main ()
    exit (find_stack_direction() < 0);
  }
  EOF
 -if { (eval echo configure:56644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:57620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:57962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
  else
-@@ -56662,7 +57638,7 @@
+@@ -56662,7 +57980,7 @@ EOF
  fi
  
        echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
 -echo "configure:56666: checking for 8-bit clean memcmp" >&5
-+echo "configure:57642: checking for 8-bit clean memcmp" >&5
++echo "configure:57984: checking for 8-bit clean memcmp" >&5
  if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -56670,7 +57646,7 @@
+@@ -56670,7 +57988,7 @@ else
    ac_cv_func_memcmp_clean=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 56674 "configure"
-+#line 57650 "configure"
++#line 57992 "configure"
  #include "confdefs.h"
  
  main()
-@@ -56680,7 +57656,7 @@
+@@ -56680,7 +57998,7 @@ main()
  }
  
  EOF
 -if { (eval echo configure:56684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:57660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:58002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_memcmp_clean=yes
  else
-@@ -56699,17 +57675,17 @@
+@@ -56699,17 +58017,17 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
  
        ac_safe=`echo "stdarg.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for stdarg.h""... $ac_c" 1>&6
 -echo "configure:56703: checking for stdarg.h" >&5
-+echo "configure:57679: checking for stdarg.h" >&5
++echo "configure:58021: checking for stdarg.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 56708 "configure"
-+#line 57684 "configure"
++#line 58026 "configure"
  #include "confdefs.h"
  #include <stdarg.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:56713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:57689: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:58031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -56939,7 +57915,7 @@
+@@ -56939,7 +58257,7 @@ EOF
    done
  
    echo $ac_n "checking for onig_init in -lonig""... $ac_c" 1>&6
 -echo "configure:56943: checking for onig_init in -lonig" >&5
-+echo "configure:57919: checking for onig_init in -lonig" >&5
++echo "configure:58261: checking for onig_init in -lonig" >&5
  ac_lib_var=`echo onig'_'onig_init | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -56947,7 +57923,7 @@
+@@ -56947,7 +58265,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lonig  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 56951 "configure"
-+#line 57927 "configure"
++#line 58269 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -56958,7 +57934,7 @@
+@@ -56958,7 +58276,7 @@ int main() {
  onig_init()
  ; return 0; }
  EOF
 -if { (eval echo configure:56962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:57938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:58280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -57184,9 +58160,9 @@
+@@ -57184,9 +58502,9 @@ fi
    done
  
        echo $ac_n "checking if oniguruma has an invalid entry for KOI8 encoding""... $ac_c" 1>&6
 -echo "configure:57188: checking if oniguruma has an invalid entry for KOI8 encoding" >&5
-+echo "configure:58164: checking if oniguruma has an invalid entry for KOI8 encoding" >&5
++echo "configure:58506: checking if oniguruma has an invalid entry for KOI8 encoding" >&5
        cat > conftest.$ac_ext <<EOF
 -#line 57190 "configure"
-+#line 58166 "configure"
++#line 58508 "configure"
  #include "confdefs.h"
  
  #include <oniguruma.h>
-@@ -57197,7 +58173,7 @@
+@@ -57197,7 +58515,7 @@ return (int)(ONIG_ENCODING_KOI8 + 1);
        
  ; return 0; }
  EOF
 -if { (eval echo configure:57201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:58177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:58519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    
          echo "$ac_t""no" 1>&6
-@@ -57495,7 +58471,7 @@
+@@ -57495,7 +58813,7 @@ EOF
    done
  
    echo $ac_n "checking for mbfl_buffer_converter_new in -lmbfl""... $ac_c" 1>&6
 -echo "configure:57499: checking for mbfl_buffer_converter_new in -lmbfl" >&5
-+echo "configure:58475: checking for mbfl_buffer_converter_new in -lmbfl" >&5
++echo "configure:58817: checking for mbfl_buffer_converter_new in -lmbfl" >&5
  ac_lib_var=`echo mbfl'_'mbfl_buffer_converter_new | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -57503,7 +58479,7 @@
+@@ -57503,7 +58821,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lmbfl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 57507 "configure"
-+#line 58483 "configure"
++#line 58825 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -57514,7 +58490,7 @@
+@@ -57514,7 +58832,7 @@ int main() {
  mbfl_buffer_converter_new()
  ; return 0; }
  EOF
 -if { (eval echo configure:57518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:58494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:58836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -58151,7 +59127,7 @@
+@@ -58151,7 +59469,7 @@ fi
  php_with_mcrypt=no
  
  echo $ac_n "checking for mcrypt support""... $ac_c" 1>&6
 -echo "configure:58155: checking for mcrypt support" >&5
-+echo "configure:59131: checking for mcrypt support" >&5
++echo "configure:59473: checking for mcrypt support" >&5
  # Check whether --with-mcrypt or --without-mcrypt was given.
  if test "${with_mcrypt+set}" = set; then
    withval="$with_mcrypt"
-@@ -58204,9 +59180,9 @@
+@@ -58204,9 +59522,9 @@ if test "$PHP_MCRYPT" != "no"; then
    old_CPPFLAGS=$CPPFLAGS
    CPPFLAGS=-I$MCRYPT_DIR/include
    echo $ac_n "checking for libmcrypt version""... $ac_c" 1>&6
 -echo "configure:58208: checking for libmcrypt version" >&5
-+echo "configure:59184: checking for libmcrypt version" >&5
++echo "configure:59526: checking for libmcrypt version" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 58210 "configure"
-+#line 59186 "configure"
++#line 59528 "configure"
  #include "confdefs.h"
  
  #include <mcrypt.h>
-@@ -58330,7 +59306,7 @@
+@@ -58330,7 +59648,7 @@ rm -f conftest*
    done
  
    echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6
 -echo "configure:58334: checking for mcrypt_module_open in -lmcrypt" >&5
-+echo "configure:59310: checking for mcrypt_module_open in -lmcrypt" >&5
++echo "configure:59652: checking for mcrypt_module_open in -lmcrypt" >&5
  ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -58338,7 +59314,7 @@
+@@ -58338,7 +59656,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lmcrypt  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 58342 "configure"
-+#line 59318 "configure"
++#line 59660 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -58349,7 +59325,7 @@
+@@ -58349,7 +59667,7 @@ int main() {
  mcrypt_module_open()
  ; return 0; }
  EOF
 -if { (eval echo configure:58353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:59329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:59671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -58502,7 +59478,7 @@
+@@ -58502,7 +59820,7 @@ else
    done
  
    echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6
 -echo "configure:58506: checking for mcrypt_module_open in -lmcrypt" >&5
-+echo "configure:59482: checking for mcrypt_module_open in -lmcrypt" >&5
++echo "configure:59824: checking for mcrypt_module_open in -lmcrypt" >&5
  ac_lib_var=`echo mcrypt'_'mcrypt_module_open | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -58510,7 +59486,7 @@
+@@ -58510,7 +59828,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lmcrypt  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 58514 "configure"
-+#line 59490 "configure"
++#line 59832 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -58521,7 +59497,7 @@
+@@ -58521,7 +59839,7 @@ int main() {
  mcrypt_module_open()
  ; return 0; }
  EOF
 -if { (eval echo configure:58525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:59501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:59843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -58994,7 +59970,7 @@
+@@ -58994,7 +60312,7 @@ fi
  php_with_mssql=no
  
  echo $ac_n "checking for MSSQL support via FreeTDS""... $ac_c" 1>&6
 -echo "configure:58998: checking for MSSQL support via FreeTDS" >&5
-+echo "configure:59974: checking for MSSQL support via FreeTDS" >&5
++echo "configure:60316: checking for MSSQL support via FreeTDS" >&5
  # Check whether --with-mssql or --without-mssql was given.
  if test "${with_mssql+set}" = set; then
    withval="$with_mssql"
-@@ -59492,7 +60468,7 @@
+@@ -59492,7 +60810,7 @@ EOF
    fi
  
    echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
 -echo "configure:59496: checking for dnet_addr in -ldnet_stub" >&5
-+echo "configure:60472: checking for dnet_addr in -ldnet_stub" >&5
++echo "configure:60814: checking for dnet_addr in -ldnet_stub" >&5
  ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -59500,7 +60476,7 @@
+@@ -59500,7 +60818,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ldnet_stub  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 59504 "configure"
-+#line 60480 "configure"
++#line 60822 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -59511,7 +60487,7 @@
+@@ -59511,7 +60829,7 @@ int main() {
  dnet_addr()
  ; return 0; }
  EOF
 -if { (eval echo configure:59515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:60491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:60833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -59655,7 +60631,7 @@
+@@ -59655,7 +60973,7 @@ fi
  php_with_mysql=no
  
  echo $ac_n "checking for MySQL support""... $ac_c" 1>&6
 -echo "configure:59659: checking for MySQL support" >&5
-+echo "configure:60635: checking for MySQL support" >&5
++echo "configure:60977: checking for MySQL support" >&5
  # Check whether --with-mysql or --without-mysql was given.
  if test "${with_mysql+set}" = set; then
    withval="$with_mysql"
-@@ -59699,7 +60675,7 @@
+@@ -59699,7 +61017,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_with_mysql_sock=no
  
  echo $ac_n "checking for specified location of the MySQL UNIX socket""... $ac_c" 1>&6
 -echo "configure:59703: checking for specified location of the MySQL UNIX socket" >&5
-+echo "configure:60679: checking for specified location of the MySQL UNIX socket" >&5
++echo "configure:61021: checking for specified location of the MySQL UNIX socket" >&5
  # Check whether --with-mysql-sock or --without-mysql-sock was given.
  if test "${with_mysql_sock+set}" = set; then
    withval="$with_mysql_sock"
-@@ -59723,7 +60699,7 @@
+@@ -59723,7 +61041,7 @@ if test -z "$PHP_ZLIB_DIR"; then
  php_with_zlib_dir=no
  
  echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
 -echo "configure:59727: checking for the location of libz" >&5
-+echo "configure:60703: checking for the location of libz" >&5
++echo "configure:61045: checking for the location of libz" >&5
  # Check whether --with-zlib-dir or --without-zlib-dir was given.
  if test "${with_zlib_dir+set}" = set; then
    withval="$with_zlib_dir"
-@@ -59897,7 +60873,7 @@
+@@ -59897,7 +61215,7 @@ Note that the MySQL client library is not bundled anymore!" 1>&2; exit 1; }
    done
  
    echo $ac_n "checking for mysql_close in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
 -echo "configure:59901: checking for mysql_close in -l$MYSQL_LIBNAME" >&5
-+echo "configure:60877: checking for mysql_close in -l$MYSQL_LIBNAME" >&5
++echo "configure:61219: checking for mysql_close in -l$MYSQL_LIBNAME" >&5
  ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_close | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -59905,7 +60881,7 @@
+@@ -59905,7 +61223,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$MYSQL_LIBNAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 59909 "configure"
-+#line 60885 "configure"
++#line 61227 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -59916,7 +60892,7 @@
+@@ -59916,7 +61234,7 @@ int main() {
  mysql_close()
  ; return 0; }
  EOF
 -if { (eval echo configure:59920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:60896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:61238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -60139,7 +61115,7 @@
+@@ -60139,7 +61457,7 @@ else
    done
  
    echo $ac_n "checking for mysql_error in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
 -echo "configure:60143: checking for mysql_error in -l$MYSQL_LIBNAME" >&5
-+echo "configure:61119: checking for mysql_error in -l$MYSQL_LIBNAME" >&5
++echo "configure:61461: checking for mysql_error in -l$MYSQL_LIBNAME" >&5
  ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_error | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -60147,7 +61123,7 @@
+@@ -60147,7 +61465,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$MYSQL_LIBNAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 60151 "configure"
-+#line 61127 "configure"
++#line 61469 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -60158,7 +61134,7 @@
+@@ -60158,7 +61476,7 @@ int main() {
  mysql_error()
  ; return 0; }
  EOF
 -if { (eval echo configure:60162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:61138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:61480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -60313,7 +61289,7 @@
+@@ -60313,7 +61631,7 @@ fi
    done
  
    echo $ac_n "checking for mysql_errno in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
 -echo "configure:60317: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5
-+echo "configure:61293: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5
++echo "configure:61635: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5
  ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_errno | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -60321,7 +61297,7 @@
+@@ -60321,7 +61639,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$MYSQL_LIBNAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 60325 "configure"
-+#line 61301 "configure"
++#line 61643 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -60332,7 +61308,7 @@
+@@ -60332,7 +61650,7 @@ int main() {
  mysql_errno()
  ; return 0; }
  EOF
 -if { (eval echo configure:60336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:61312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:61654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -60526,7 +61502,7 @@
+@@ -60526,7 +61844,7 @@ fi
  
  if test "$PHP_MYSQL" != "no"; then
    echo $ac_n "checking for MySQL UNIX socket location""... $ac_c" 1>&6
 -echo "configure:60530: checking for MySQL UNIX socket location" >&5
-+echo "configure:61506: checking for MySQL UNIX socket location" >&5
++echo "configure:61848: checking for MySQL UNIX socket location" >&5
    if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then
      MYSQL_SOCK=$PHP_MYSQL_SOCK
      cat >> confdefs.h <<EOF
-@@ -60899,7 +61875,7 @@
+@@ -60899,7 +62217,7 @@ fi
  php_with_mysqli=no
  
  echo $ac_n "checking for MySQLi support""... $ac_c" 1>&6
 -echo "configure:60903: checking for MySQLi support" >&5
-+echo "configure:61879: checking for MySQLi support" >&5
++echo "configure:62221: checking for MySQLi support" >&5
  # Check whether --with-mysqli or --without-mysqli was given.
  if test "${with_mysqli+set}" = set; then
    withval="$with_mysqli"
-@@ -60943,7 +61919,7 @@
+@@ -60943,7 +62261,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_enable_embedded_mysqli=no
  
  echo $ac_n "checking whether to enable embedded MySQLi support""... $ac_c" 1>&6
 -echo "configure:60947: checking whether to enable embedded MySQLi support" >&5
-+echo "configure:61923: checking whether to enable embedded MySQLi support" >&5
++echo "configure:62265: checking whether to enable embedded MySQLi support" >&5
  # Check whether --enable-embedded_mysqli or --disable-embedded_mysqli was given.
  if test "${enable_embedded_mysqli+set}" = set; then
    enableval="$enable_embedded_mysqli"
-@@ -61094,7 +62070,7 @@
+@@ -61094,7 +62412,7 @@ EOF
    done
  
    echo $ac_n "checking for mysql_set_server_option in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
 -echo "configure:61098: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5
-+echo "configure:62074: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5
++echo "configure:62416: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5
  ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_server_option | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -61102,7 +62078,7 @@
+@@ -61102,7 +62420,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$MYSQL_LIB_NAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 61106 "configure"
-+#line 62082 "configure"
++#line 62424 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -61113,7 +62089,7 @@
+@@ -61113,7 +62431,7 @@ int main() {
  mysql_set_server_option()
  ; return 0; }
  EOF
 -if { (eval echo configure:61117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:62093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:62435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -61361,7 +62337,7 @@
+@@ -61361,7 +62679,7 @@ EOF
    done
  
    echo $ac_n "checking for mysql_set_character_set in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
 -echo "configure:61365: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5
-+echo "configure:62341: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5
++echo "configure:62683: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5
  ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_character_set | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -61369,7 +62345,7 @@
+@@ -61369,7 +62687,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$MYSQL_LIB_NAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 61373 "configure"
-+#line 62349 "configure"
++#line 62691 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -61380,7 +62356,7 @@
+@@ -61380,7 +62698,7 @@ int main() {
  mysql_set_character_set()
  ; return 0; }
  EOF
 -if { (eval echo configure:61384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:62360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:62702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -61524,7 +62500,7 @@
+@@ -61524,7 +62842,7 @@ fi
    done
  
    echo $ac_n "checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6
 -echo "configure:61528: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5
-+echo "configure:62504: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5
++echo "configure:62846: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5
  ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_stmt_next_result | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -61532,7 +62508,7 @@
+@@ -61532,7 +62850,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$MYSQL_LIB_NAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 61536 "configure"
-+#line 62512 "configure"
++#line 62854 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -61543,7 +62519,7 @@
+@@ -61543,7 +62861,7 @@ int main() {
  mysql_stmt_next_result()
  ; return 0; }
  EOF
 -if { (eval echo configure:61547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:62523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:62865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -61947,7 +62923,7 @@
+@@ -61947,7 +63265,7 @@ fi
  php_with_oci8=no
  
  echo $ac_n "checking for Oracle (OCI8) support""... $ac_c" 1>&6
 -echo "configure:61951: checking for Oracle (OCI8) support" >&5
-+echo "configure:62927: checking for Oracle (OCI8) support" >&5
++echo "configure:63269: checking for Oracle (OCI8) support" >&5
  # Check whether --with-oci8 or --without-oci8 was given.
  if test "${with_oci8+set}" = set; then
    withval="$with_oci8"
-@@ -61995,7 +62971,7 @@
+@@ -61995,7 +63313,7 @@ if test "$PHP_OCI8" != "no"; then
  
    
    echo $ac_n "checking PHP version""... $ac_c" 1>&6
 -echo "configure:61999: checking PHP version" >&5
-+echo "configure:62975: checking PHP version" >&5
++echo "configure:63317: checking PHP version" >&5
  
    tmp_version=$PHP_VERSION
    if test -z "$tmp_version"; then
-@@ -62027,7 +63003,7 @@
+@@ -62027,7 +63345,7 @@ echo "configure:61999: checking PHP version" >&5
  
    
    echo $ac_n "checking size of long int""... $ac_c" 1>&6
 -echo "configure:62031: checking size of long int" >&5
-+echo "configure:63007: checking size of long int" >&5
++echo "configure:63349: checking size of long int" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -62035,18 +63011,19 @@
+@@ -62035,18 +63353,19 @@ else
    ac_cv_sizeof_long_int=4
  else
    cat > conftest.$ac_ext <<EOF
 -#line 62039 "configure"
-+#line 63015 "configure"
++#line 63357 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -10427,558 +10779,558 @@
  }
  EOF
 -if { (eval echo configure:62050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:63027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:63369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_long_int=`cat conftestval`
  else
-@@ -62066,7 +63043,7 @@
+@@ -62066,7 +63385,7 @@ EOF
  
  
    echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6
 -echo "configure:62070: checking checking if we're on a 64-bit platform" >&5
-+echo "configure:63047: checking checking if we're on a 64-bit platform" >&5
++echo "configure:63389: checking checking if we're on a 64-bit platform" >&5
    if test "$ac_cv_sizeof_long_int" = "4"; then
      echo "$ac_t""no" 1>&6
      PHP_OCI8_OH_LIBDIR=lib32 
-@@ -62110,7 +63087,7 @@
+@@ -62110,7 +63429,7 @@ echo "configure:62070: checking checking if we're on a 64-bit platform" >&5
    if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then
              
      echo $ac_n "checking Oracle ORACLE_HOME install directory""... $ac_c" 1>&6
 -echo "configure:62114: checking Oracle ORACLE_HOME install directory" >&5
-+echo "configure:63091: checking Oracle ORACLE_HOME install directory" >&5
++echo "configure:63433: checking Oracle ORACLE_HOME install directory" >&5
  
      if test "$PHP_OCI8" = "yes"; then
        OCI8_DIR=$ORACLE_HOME
-@@ -62121,7 +63098,7 @@
+@@ -62121,7 +63440,7 @@ echo "configure:62114: checking Oracle ORACLE_HOME install directory" >&5
  
      
    echo $ac_n "checking ORACLE_HOME library validity""... $ac_c" 1>&6
 -echo "configure:62125: checking ORACLE_HOME library validity" >&5
-+echo "configure:63102: checking ORACLE_HOME library validity" >&5
++echo "configure:63444: checking ORACLE_HOME library validity" >&5
    if test ! -d "$OCI8_DIR"; then
      { echo "configure: error: ${OCI8_DIR} is not a directory" 1>&2; exit 1; }
    fi
-@@ -62462,7 +63439,7 @@
+@@ -62462,7 +63781,7 @@ echo "configure:62125: checking ORACLE_HOME library validity" >&5
  
      
    echo $ac_n "checking Oracle version""... $ac_c" 1>&6
 -echo "configure:62466: checking Oracle version" >&5
-+echo "configure:63443: checking Oracle version" >&5
++echo "configure:63785: checking Oracle version" >&5
    if test -s "$OCI8_DIR/orainst/unix.rgs"; then
      OCI8_ORACLE_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | $PHP_OCI8_SED 's/  */:/g' | cut -d: -f 6 | cut -c 2-4`
      test -z "$OCI8_ORACLE_VERSION" && OCI8_ORACLE_VERSION=7.3
-@@ -62592,7 +63569,7 @@
+@@ -62592,7 +63911,7 @@ echo "configure:62466: checking Oracle version" >&5
    done
  
    echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
 -echo "configure:62596: checking for OCIEnvNlsCreate in -lclntsh" >&5
-+echo "configure:63573: checking for OCIEnvNlsCreate in -lclntsh" >&5
++echo "configure:63915: checking for OCIEnvNlsCreate in -lclntsh" >&5
  ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -62600,7 +63577,7 @@
+@@ -62600,7 +63919,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lclntsh  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 62604 "configure"
-+#line 63581 "configure"
++#line 63923 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -62611,7 +63588,7 @@
+@@ -62611,7 +63930,7 @@ int main() {
  OCIEnvNlsCreate()
  ; return 0; }
  EOF
 -if { (eval echo configure:62615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:63592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:63934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -63048,7 +64025,7 @@
+@@ -63048,7 +64367,7 @@ EOF
    else
              
      echo $ac_n "checking Oracle Instant Client directory""... $ac_c" 1>&6
 -echo "configure:63052: checking Oracle Instant Client directory" >&5
-+echo "configure:64029: checking Oracle Instant Client directory" >&5
++echo "configure:64371: checking Oracle Instant Client directory" >&5
  
      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 | tail -1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'`
-@@ -63061,7 +64038,7 @@
+@@ -63061,7 +64380,7 @@ echo "configure:63052: checking Oracle Instant Client directory" >&5
      OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT
  
      echo $ac_n "checking Oracle Instant Client SDK header directory""... $ac_c" 1>&6
 -echo "configure:63065: checking Oracle Instant Client SDK header directory" >&5
-+echo "configure:64042: checking Oracle Instant Client SDK header directory" >&5
++echo "configure:64384: checking Oracle Instant Client SDK header directory" >&5
  
          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!'`
  
-@@ -63270,7 +64247,7 @@
+@@ -63270,7 +64589,7 @@ echo "configure:63065: checking Oracle Instant Client SDK header directory" >&5
  
      
    echo $ac_n "checking Oracle Instant Client version""... $ac_c" 1>&6
 -echo "configure:63274: checking Oracle Instant Client version" >&5
-+echo "configure:64251: checking Oracle Instant Client version" >&5
++echo "configure:64593: checking Oracle Instant Client version" >&5
    if test -f $PHP_OCI8_INSTANT_CLIENT/libnnz11.$SHLIB_SUFFIX_NAME; then
      if test -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then
        if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then
-@@ -63749,7 +64726,7 @@
+@@ -63749,7 +65068,7 @@ esac
  
    if test "$PHP_ADABAS" != "no"; then
      echo $ac_n "checking for Adabas support""... $ac_c" 1>&6
 -echo "configure:63753: checking for Adabas support" >&5
-+echo "configure:64730: checking for Adabas support" >&5
++echo "configure:65072: checking for Adabas support" >&5
      if test "$PHP_ADABAS" = "yes"; then
        PHP_ADABAS=/usr/local
      fi
-@@ -63952,7 +64929,7 @@
+@@ -63952,7 +65271,7 @@ esac
  
    if test "$PHP_SAPDB" != "no"; then
      echo $ac_n "checking for SAP DB support""... $ac_c" 1>&6
 -echo "configure:63956: checking for SAP DB support" >&5
-+echo "configure:64933: checking for SAP DB support" >&5
++echo "configure:65275: checking for SAP DB support" >&5
      if test "$PHP_SAPDB" = "yes"; then
        PHP_SAPDB=/usr/local
      fi
-@@ -64085,7 +65062,7 @@
+@@ -64085,7 +65404,7 @@ esac
  
    if test "$PHP_SOLID" != "no"; then
      echo $ac_n "checking for Solid support""... $ac_c" 1>&6
 -echo "configure:64089: checking for Solid support" >&5
-+echo "configure:65066: checking for Solid support" >&5
++echo "configure:65408: checking for Solid support" >&5
      if test "$PHP_SOLID" = "yes"; then
        PHP_SOLID=/usr/local/solid
      fi
-@@ -64112,7 +65089,7 @@
+@@ -64112,7 +65431,7 @@ EOF
      echo "$ac_t""$ext_output" 1>&6
      
    echo $ac_n "checking Solid library file""... $ac_c" 1>&6
 -echo "configure:64116: checking Solid library file" >&5  
-+echo "configure:65093: checking Solid library file" >&5  
++echo "configure:65435: checking Solid library file" >&5  
    ac_solid_uname_r=`uname -r 2>/dev/null`
    ac_solid_uname_s=`uname -s 2>/dev/null`
    case $ac_solid_uname_s in
-@@ -64233,7 +65210,7 @@
+@@ -64233,7 +65552,7 @@ esac
  
    if test "$PHP_IBM_DB2" != "no"; then
      echo $ac_n "checking for IBM DB2 support""... $ac_c" 1>&6
 -echo "configure:64237: checking for IBM DB2 support" >&5
-+echo "configure:65214: checking for IBM DB2 support" >&5
++echo "configure:65556: checking for IBM DB2 support" >&5
      if test "$PHP_IBM_DB2" = "yes"; then
        ODBC_INCDIR=/home/db2inst1/sqllib/include
        ODBC_LIBDIR=/home/db2inst1/sqllib/lib
-@@ -64264,7 +65241,7 @@
+@@ -64264,7 +65583,7 @@ fi
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 64268 "configure"
-+#line 65245 "configure"
++#line 65587 "configure"
  #include "confdefs.h"
  
      
-@@ -64275,7 +65252,7 @@
+@@ -64275,7 +65594,7 @@ else
      }
    
  EOF
 -if { (eval echo configure:64279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:65256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:65598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      LIBS=$old_LIBS
-@@ -64356,7 +65333,7 @@
+@@ -64356,7 +65675,7 @@ esac
  
    if test "$PHP_ODBCROUTER" != "no"; then
      echo $ac_n "checking for ODBCRouter.com support""... $ac_c" 1>&6
 -echo "configure:64360: checking for ODBCRouter.com support" >&5
-+echo "configure:65337: checking for ODBCRouter.com support" >&5
++echo "configure:65679: checking for ODBCRouter.com support" >&5
      if test "$PHP_ODBCROUTER" = "yes"; then
        PHP_ODBCROUTER=/usr
      fi
-@@ -64420,7 +65397,7 @@
+@@ -64420,7 +65739,7 @@ esac
  
    if test "$PHP_EMPRESS" != "no"; then
      echo $ac_n "checking for Empress support""... $ac_c" 1>&6
 -echo "configure:64424: checking for Empress support" >&5
-+echo "configure:65401: checking for Empress support" >&5
++echo "configure:65743: checking for Empress support" >&5
      if test "$PHP_EMPRESS" = "yes"; then
        ODBC_INCDIR=$EMPRESSPATH/include/odbc
        ODBC_LIBDIR=$EMPRESSPATH/shlib
-@@ -64438,7 +65415,7 @@
+@@ -64438,7 +65757,7 @@ EOF
      echo "$ac_t""$ext_output" 1>&6
      
    echo $ac_n "checking Empress library file""... $ac_c" 1>&6
 -echo "configure:64442: checking Empress library file" >&5
-+echo "configure:65419: checking Empress library file" >&5
++echo "configure:65761: checking Empress library file" >&5
    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`
-@@ -64494,7 +65471,7 @@
+@@ -64494,7 +65813,7 @@ esac
  
    if test "$PHP_EMPRESS_BCS" != "no"; then
      echo $ac_n "checking for Empress local access support""... $ac_c" 1>&6
 -echo "configure:64498: checking for Empress local access support" >&5
-+echo "configure:65475: checking for Empress local access support" >&5
++echo "configure:65817: checking for Empress local access support" >&5
      if test "$PHP_EMPRESS_BCS" = "yes"; then
        ODBC_INCDIR=$EMPRESSPATH/include/odbc
        ODBC_LIBDIR=$EMPRESSPATH/shlib
-@@ -64528,7 +65505,7 @@
+@@ -64528,7 +65847,7 @@ EOF
      echo "$ac_t""$ext_output" 1>&6
      
    echo $ac_n "checking Empress local access library file""... $ac_c" 1>&6
 -echo "configure:64532: checking Empress local access library file" >&5
-+echo "configure:65509: checking Empress local access library file" >&5
++echo "configure:65851: checking Empress local access library file" >&5
    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`
-@@ -64584,7 +65561,7 @@
+@@ -64584,7 +65903,7 @@ esac
    
    if test "$PHP_BIRDSTEP" != "no"; then
      echo $ac_n "checking for Birdstep support""... $ac_c" 1>&6
 -echo "configure:64588: checking for Birdstep support" >&5
-+echo "configure:65565: checking for Birdstep support" >&5
++echo "configure:65907: checking for Birdstep support" >&5
      if test "$PHP_BIRDSTEP" = "yes"; then
          ODBC_INCDIR=/usr/local/birdstep/include
          ODBC_LIBDIR=/usr/local/birdstep/lib
-@@ -64696,7 +65673,7 @@
+@@ -64696,7 +66015,7 @@ esac
  
    if test "$PHP_CUSTOM_ODBC" != "no"; then
      echo $ac_n "checking for a custom ODBC support""... $ac_c" 1>&6
 -echo "configure:64700: checking for a custom ODBC support" >&5
-+echo "configure:65677: checking for a custom ODBC support" >&5
++echo "configure:66019: checking for a custom ODBC support" >&5
      if test "$PHP_CUSTOM_ODBC" = "yes"; then
        PHP_CUSTOM_ODBC=/usr/local
      fi
-@@ -64760,7 +65737,7 @@
+@@ -64760,7 +66079,7 @@ esac
  
    if test "$PHP_IODBC" != "no"; then
      echo $ac_n "checking for iODBC support""... $ac_c" 1>&6
 -echo "configure:64764: checking for iODBC support" >&5
-+echo "configure:65741: checking for iODBC support" >&5
++echo "configure:66083: checking for iODBC support" >&5
      if test "$PHP_IODBC" = "yes"; then
        PHP_IODBC=/usr/local
      fi
-@@ -64906,7 +65883,7 @@
+@@ -64906,7 +66225,7 @@ esac
  
    if test "$PHP_ESOOB" != "no"; then
      echo $ac_n "checking for Easysoft ODBC-ODBC Bridge support""... $ac_c" 1>&6
 -echo "configure:64910: checking for Easysoft ODBC-ODBC Bridge support" >&5
-+echo "configure:65887: checking for Easysoft ODBC-ODBC Bridge support" >&5
++echo "configure:66229: checking for Easysoft ODBC-ODBC Bridge support" >&5
      if test "$PHP_ESOOB" = "yes"; then
        PHP_ESOOB=/usr/local/easysoft/oob/client
      fi
-@@ -64970,7 +65947,7 @@
+@@ -64970,7 +66289,7 @@ esac
  
    if test "$PHP_UNIXODBC" != "no"; then
      echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6
 -echo "configure:64974: checking for unixODBC support" >&5
-+echo "configure:65951: checking for unixODBC support" >&5
++echo "configure:66293: checking for unixODBC support" >&5
      if test "$PHP_UNIXODBC" = "yes"; then
        PHP_UNIXODBC=/usr/local
      fi
-@@ -65039,7 +66016,7 @@
+@@ -65039,7 +66358,7 @@ esac
  
    if test "$PHP_DBMAKER" != "no"; then
      echo $ac_n "checking for DBMaker support""... $ac_c" 1>&6
 -echo "configure:65043: checking for DBMaker support" >&5
-+echo "configure:66020: checking for DBMaker support" >&5
++echo "configure:66362: checking for DBMaker support" >&5
      if test "$PHP_DBMAKER" = "yes"; then
        # find dbmaker's home directory
        DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'`
-@@ -65601,7 +66578,7 @@
+@@ -65601,7 +66920,7 @@ fi
  php_enable_pcntl=no
  
  echo $ac_n "checking whether to enable pcntl support""... $ac_c" 1>&6
 -echo "configure:65605: checking whether to enable pcntl support" >&5
-+echo "configure:66582: checking whether to enable pcntl support" >&5
++echo "configure:66924: checking whether to enable pcntl support" >&5
  # Check whether --enable-pcntl or --disable-pcntl was given.
  if test "${enable_pcntl+set}" = set; then
    enableval="$enable_pcntl"
-@@ -65645,12 +66622,12 @@
+@@ -65645,12 +66964,12 @@ if test "$PHP_PCNTL" != "no"; then
    for ac_func in fork
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:65649: checking for $ac_func" >&5
-+echo "configure:66626: checking for $ac_func" >&5
++echo "configure:66968: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 65654 "configure"
-+#line 66631 "configure"
++#line 66973 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -65673,7 +66650,7 @@
+@@ -65673,7 +66992,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:65677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:66654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:66996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -65704,12 +66681,12 @@
+@@ -65704,12 +67023,12 @@ done
    for ac_func in waitpid
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:65708: checking for $ac_func" >&5
-+echo "configure:66685: checking for $ac_func" >&5
++echo "configure:67027: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 65713 "configure"
-+#line 66690 "configure"
++#line 67032 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -65732,7 +66709,7 @@
+@@ -65732,7 +67051,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:65736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:66713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:67055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -65763,12 +66740,12 @@
+@@ -65763,12 +67082,12 @@ done
    for ac_func in sigaction
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:65767: checking for $ac_func" >&5
-+echo "configure:66744: checking for $ac_func" >&5
++echo "configure:67086: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 65772 "configure"
-+#line 66749 "configure"
++#line 67091 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -65791,7 +66768,7 @@
+@@ -65791,7 +67110,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:65795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:66772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:67114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -65822,12 +66799,12 @@
+@@ -65822,12 +67141,12 @@ done
    for ac_func in getpriority setpriority wait3 sigprocmask sigwaitinfo sigtimedwait
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:65826: checking for $ac_func" >&5
-+echo "configure:66803: checking for $ac_func" >&5
++echo "configure:67145: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 65831 "configure"
-+#line 66808 "configure"
++#line 67150 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -65850,7 +66827,7 @@
+@@ -65850,7 +67169,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:65854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:66831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:67173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -66175,7 +67152,7 @@
+@@ -66175,7 +67494,7 @@ fi
  php_enable_pdo=yes
  
  echo $ac_n "checking whether to enable PDO support""... $ac_c" 1>&6
 -echo "configure:66179: checking whether to enable PDO support" >&5
-+echo "configure:67156: checking whether to enable PDO support" >&5
++echo "configure:67498: checking whether to enable PDO support" >&5
  # Check whether --enable-pdo or --disable-pdo was given.
  if test "${enable_pdo+set}" = set; then
    enableval="$enable_pdo"
-@@ -66609,7 +67586,7 @@
+@@ -66609,7 +67928,7 @@ fi
  php_with_pdo_dblib=no
  
  echo $ac_n "checking for PDO_DBLIB support via FreeTDS""... $ac_c" 1>&6
 -echo "configure:66613: checking for PDO_DBLIB support via FreeTDS" >&5
-+echo "configure:67590: checking for PDO_DBLIB support via FreeTDS" >&5
++echo "configure:67932: checking for PDO_DBLIB support via FreeTDS" >&5
  # Check whether --with-pdo-dblib or --without-pdo-dblib was given.
  if test "${with_pdo_dblib+set}" = set; then
    withval="$with_pdo_dblib"
-@@ -66826,13 +67803,13 @@
+@@ -66826,13 +68145,13 @@ if test "$PHP_PDO_DBLIB" != "no"; then
    
      
    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
 -echo "configure:66830: checking for PDO includes" >&5
-+echo "configure:67807: checking for PDO includes" >&5
++echo "configure:68149: checking for PDO includes" >&5
  if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
      echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
 -echo "configure:66836: checking for PDO includes" >&5
-+echo "configure:67813: checking for PDO includes" >&5
++echo "configure:68155: checking for PDO includes" >&5
      if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
        pdo_inc_path=$abs_srcdir/ext
      elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
-@@ -67146,7 +68123,7 @@
+@@ -67146,7 +68465,7 @@ EOF
    fi
  
    echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6
 -echo "configure:67150: checking for dnet_addr in -ldnet_stub" >&5
-+echo "configure:68127: checking for dnet_addr in -ldnet_stub" >&5
++echo "configure:68469: checking for dnet_addr in -ldnet_stub" >&5
  ac_lib_var=`echo dnet_stub'_'dnet_addr | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -67154,7 +68131,7 @@
+@@ -67154,7 +68473,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ldnet_stub  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 67158 "configure"
-+#line 68135 "configure"
++#line 68477 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -67165,7 +68142,7 @@
+@@ -67165,7 +68484,7 @@ int main() {
  dnet_addr()
  ; return 0; }
  EOF
 -if { (eval echo configure:67169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:68146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:68488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -67326,7 +68303,7 @@
+@@ -67326,7 +68645,7 @@ fi
  php_with_pdo_firebird=no
  
  echo $ac_n "checking for Firebird support for PDO""... $ac_c" 1>&6
 -echo "configure:67330: checking for Firebird support for PDO" >&5
-+echo "configure:68307: checking for Firebird support for PDO" >&5
++echo "configure:68649: checking for Firebird support for PDO" >&5
  # Check whether --with-pdo-firebird or --without-pdo-firebird was given.
  if test "${with_pdo_firebird+set}" = set; then
    withval="$with_pdo_firebird"
-@@ -67480,7 +68457,7 @@
+@@ -67480,7 +68799,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then
    done
  
    echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6
 -echo "configure:67484: checking for isc_detach_database in -lfbclient" >&5
-+echo "configure:68461: checking for isc_detach_database in -lfbclient" >&5
++echo "configure:68803: checking for isc_detach_database in -lfbclient" >&5
  ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -67488,7 +68465,7 @@
+@@ -67488,7 +68807,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lfbclient  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 67492 "configure"
-+#line 68469 "configure"
++#line 68811 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -67499,7 +68476,7 @@
+@@ -67499,7 +68818,7 @@ int main() {
  isc_detach_database()
  ; return 0; }
  EOF
 -if { (eval echo configure:67503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:68480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:68822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -67626,7 +68603,7 @@
+@@ -67626,7 +68945,7 @@ else
    done
  
    echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6
 -echo "configure:67630: checking for isc_detach_database in -lgds" >&5
-+echo "configure:68607: checking for isc_detach_database in -lgds" >&5
++echo "configure:68949: checking for isc_detach_database in -lgds" >&5
  ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -67634,7 +68611,7 @@
+@@ -67634,7 +68953,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgds  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 67638 "configure"
-+#line 68615 "configure"
++#line 68957 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -67645,7 +68622,7 @@
+@@ -67645,7 +68964,7 @@ int main() {
  isc_detach_database()
  ; return 0; }
  EOF
 -if { (eval echo configure:67649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:68626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:68968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -67772,7 +68749,7 @@
+@@ -67772,7 +69091,7 @@ else
    done
  
    echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6
 -echo "configure:67776: checking for isc_detach_database in -lib_util" >&5
-+echo "configure:68753: checking for isc_detach_database in -lib_util" >&5
++echo "configure:69095: checking for isc_detach_database in -lib_util" >&5
  ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -67780,7 +68757,7 @@
+@@ -67780,7 +69099,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lib_util  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 67784 "configure"
-+#line 68761 "configure"
++#line 69103 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -67791,7 +68768,7 @@
+@@ -67791,7 +69110,7 @@ int main() {
  isc_detach_database()
  ; return 0; }
  EOF
 -if { (eval echo configure:67795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:68772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:69114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -67836,13 +68813,13 @@
+@@ -67836,13 +69155,13 @@ fi
   
    
    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
 -echo "configure:67840: checking for PDO includes" >&5
-+echo "configure:68817: checking for PDO includes" >&5
++echo "configure:69159: checking for PDO includes" >&5
  if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
      echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
 -echo "configure:67846: checking for PDO includes" >&5
-+echo "configure:68823: checking for PDO includes" >&5
++echo "configure:69165: checking for PDO includes" >&5
      if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
        pdo_inc_path=$abs_srcdir/ext
      elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
-@@ -68314,7 +69291,7 @@
+@@ -68314,7 +69633,7 @@ fi
  php_with_pdo_mysql=no
  
  echo $ac_n "checking for MySQL support for PDO""... $ac_c" 1>&6
 -echo "configure:68318: checking for MySQL support for PDO" >&5
-+echo "configure:69295: checking for MySQL support for PDO" >&5
++echo "configure:69637: checking for MySQL support for PDO" >&5
  # Check whether --with-pdo-mysql or --without-pdo-mysql was given.
  if test "${with_pdo_mysql+set}" = set; then
    withval="$with_pdo_mysql"
-@@ -68359,7 +69336,7 @@
+@@ -68359,7 +69678,7 @@ if test -z "$PHP_ZLIB_DIR"; then
  php_with_zlib_dir=no
  
  echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
 -echo "configure:68363: checking for the location of libz" >&5
-+echo "configure:69340: checking for the location of libz" >&5
++echo "configure:69682: checking for the location of libz" >&5
  # Check whether --with-zlib-dir or --without-zlib-dir was given.
  if test "${with_zlib_dir+set}" = set; then
    withval="$with_zlib_dir"
-@@ -68423,14 +69400,14 @@
+@@ -68423,14 +69742,14 @@ EOF
  
  
      echo $ac_n "checking for mysql_config""... $ac_c" 1>&6
 -echo "configure:68427: checking for mysql_config" >&5
-+echo "configure:69404: checking for mysql_config" >&5
++echo "configure:69746: checking for mysql_config" >&5
      if test -n "$PDO_MYSQL_CONFIG"; then
        echo "$ac_t""$PDO_MYSQL_CONFIG" 1>&6
        if test "x$SED" = "x"; then
@@ -10986,191 +11338,191 @@
  set dummy sed; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:68434: checking for $ac_word" >&5
-+echo "configure:69411: checking for $ac_word" >&5
++echo "configure:69753: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -68474,7 +69451,7 @@
+@@ -68474,7 +69793,7 @@ fi
      elif test -n "$PDO_MYSQL_DIR"; then
        echo "$ac_t""not found" 1>&6
        echo $ac_n "checking for mysql install under $PDO_MYSQL_DIR""... $ac_c" 1>&6
 -echo "configure:68478: checking for mysql install under $PDO_MYSQL_DIR" >&5
-+echo "configure:69455: checking for mysql install under $PDO_MYSQL_DIR" >&5
++echo "configure:69797: checking for mysql install under $PDO_MYSQL_DIR" >&5
        if test -r $PDO_MYSQL_DIR/include/mysql; then
          PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include/mysql
        else
-@@ -68628,7 +69605,7 @@
+@@ -68628,7 +69947,7 @@ echo "configure:68478: checking for mysql install under $PDO_MYSQL_DIR" >&5
    done
  
    echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
 -echo "configure:68632: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
-+echo "configure:69609: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
++echo "configure:69951: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
  ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -68636,7 +69613,7 @@
+@@ -68636,7 +69955,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$PDO_MYSQL_LIBNAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 68640 "configure"
-+#line 69617 "configure"
++#line 69959 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -68647,7 +69624,7 @@
+@@ -68647,7 +69966,7 @@ int main() {
  mysql_query()
  ; return 0; }
  EOF
 -if { (eval echo configure:68651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:69628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:69970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -69000,7 +69977,7 @@
+@@ -69000,7 +70319,7 @@ else
    done
  
    echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
 -echo "configure:69004: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
-+echo "configure:69981: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
++echo "configure:70323: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
  ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -69008,7 +69985,7 @@
+@@ -69008,7 +70327,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$PDO_MYSQL_LIBNAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 69012 "configure"
-+#line 69989 "configure"
++#line 70331 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -69019,7 +69996,7 @@
+@@ -69019,7 +70338,7 @@ int main() {
  mysql_query()
  ; return 0; }
  EOF
 -if { (eval echo configure:69023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:70000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:70342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -69174,7 +70151,7 @@
+@@ -69174,7 +70493,7 @@ fi
    done
  
    echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6
 -echo "configure:69178: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
-+echo "configure:70155: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
++echo "configure:70497: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
  ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -69182,7 +70159,7 @@
+@@ -69182,7 +70501,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$PDO_MYSQL_LIBNAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 69186 "configure"
-+#line 70163 "configure"
++#line 70505 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -69193,7 +70170,7 @@
+@@ -69193,7 +70512,7 @@ int main() {
  mysql_query()
  ; return 0; }
  EOF
 -if { (eval echo configure:69197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:70174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:70516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -69367,12 +70344,12 @@
+@@ -69367,12 +70686,12 @@ fi
      for ac_func in mysql_commit mysql_stmt_prepare mysql_next_result mysql_sqlstate
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:69371: checking for $ac_func" >&5
-+echo "configure:70348: checking for $ac_func" >&5
++echo "configure:70690: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 69376 "configure"
-+#line 70353 "configure"
++#line 70695 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -69395,7 +70372,7 @@
+@@ -69395,7 +70714,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:69399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:70376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:70718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -69425,13 +70402,13 @@
+@@ -69425,13 +70744,13 @@ done
    
      
    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
 -echo "configure:69429: checking for PDO includes" >&5
-+echo "configure:70406: checking for PDO includes" >&5
++echo "configure:70748: checking for PDO includes" >&5
  if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
      echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
 -echo "configure:69435: checking for PDO includes" >&5
-+echo "configure:70412: checking for PDO includes" >&5
++echo "configure:70754: checking for PDO includes" >&5
      if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
        pdo_inc_path=$abs_srcdir/ext
      elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
-@@ -69816,7 +70793,7 @@
+@@ -69816,7 +71135,7 @@ SUPPORTED_LIB_VERS="9.0 10.1 11.1"  # This caters for all Oracle 9.x, 10.x and 1
  php_with_pdo_oci=no
  
  echo $ac_n "checking Oracle OCI support for PDO""... $ac_c" 1>&6
 -echo "configure:69820: checking Oracle OCI support for PDO" >&5
-+echo "configure:70797: checking Oracle OCI support for PDO" >&5
++echo "configure:71139: checking Oracle OCI support for PDO" >&5
  # Check whether --with-pdo-oci or --without-pdo-oci was given.
  if test "${with_pdo_oci+set}" = set; then
    withval="$with_pdo_oci"
-@@ -69863,7 +70840,7 @@
+@@ -69863,7 +71182,7 @@ if test "$PHP_PDO_OCI" != "no"; then
    fi
  
    echo $ac_n "checking Oracle Install-Dir""... $ac_c" 1>&6
 -echo "configure:69867: checking Oracle Install-Dir" >&5
-+echo "configure:70844: checking Oracle Install-Dir" >&5
++echo "configure:71186: checking Oracle Install-Dir" >&5
    if test "$PHP_PDO_OCI" = "yes" || test -z "$PHP_PDO_OCI"; then
      PDO_OCI_DIR=$ORACLE_HOME
    else
-@@ -69872,7 +70849,7 @@
+@@ -69872,7 +71191,7 @@ echo "configure:69867: checking Oracle Install-Dir" >&5
    echo "$ac_t""$PHP_PDO_OCI" 1>&6
  
    echo $ac_n "checking if that is sane""... $ac_c" 1>&6
 -echo "configure:69876: checking if that is sane" >&5
-+echo "configure:70853: checking if that is sane" >&5
++echo "configure:71195: checking if that is sane" >&5
    if test -z "$PDO_OCI_DIR"; then
      { echo "configure: error: 
  You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_HOME.
-@@ -69885,7 +70862,7 @@
+@@ -69885,7 +71204,7 @@ You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_
      PDO_OCI_IC_PREFIX="`echo $PDO_OCI_DIR | cut -d, -f2`"
      PDO_OCI_IC_VERS="`echo $PDO_OCI_DIR | cut -d, -f3`"
      echo $ac_n "checking for oci.h""... $ac_c" 1>&6
 -echo "configure:69889: checking for oci.h" >&5
-+echo "configure:70866: checking for oci.h" >&5
++echo "configure:71208: checking for oci.h" >&5
      if test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client/oci.h ; then
        
    if test "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" != "/usr/include"; then
-@@ -70034,7 +71011,7 @@
+@@ -70034,7 +71353,7 @@ echo "configure:69889: checking for oci.h" >&5
    else
      
    echo $ac_n "checking size of long int""... $ac_c" 1>&6
 -echo "configure:70038: checking size of long int" >&5
-+echo "configure:71015: checking size of long int" >&5
++echo "configure:71357: checking size of long int" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -70042,18 +71019,19 @@
+@@ -70042,18 +71361,19 @@ else
    ac_cv_sizeof_long_int=4
  else
    cat > conftest.$ac_ext <<EOF
 -#line 70046 "configure"
-+#line 71023 "configure"
++#line 71365 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -11186,1635 +11538,1635 @@
  }
  EOF
 -if { (eval echo configure:70057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:71035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:71377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_long_int=`cat conftestval`
  else
-@@ -70073,7 +71051,7 @@
+@@ -70073,7 +71393,7 @@ EOF
  
  
    echo $ac_n "checking if we're on a 64-bit platform""... $ac_c" 1>&6
 -echo "configure:70077: checking if we're on a 64-bit platform" >&5
-+echo "configure:71055: checking if we're on a 64-bit platform" >&5
++echo "configure:71397: checking if we're on a 64-bit platform" >&5
    if test "$ac_cv_sizeof_long_int" = "4" ; then
      echo "$ac_t""no" 1>&6
      TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32"
-@@ -70083,7 +71061,7 @@
+@@ -70083,7 +71403,7 @@ echo "configure:70077: checking if we're on a 64-bit platform" >&5
    fi
  
    echo $ac_n "checking OCI8 libraries dir""... $ac_c" 1>&6
 -echo "configure:70087: checking OCI8 libraries dir" >&5
-+echo "configure:71065: checking OCI8 libraries dir" >&5
++echo "configure:71407: checking OCI8 libraries dir" >&5
    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
-@@ -70450,7 +71428,7 @@
+@@ -70450,7 +71770,7 @@ echo "configure:70087: checking OCI8 libraries dir" >&5
      fi
      
    echo $ac_n "checking Oracle version""... $ac_c" 1>&6
 -echo "configure:70454: checking Oracle version" >&5
-+echo "configure:71432: checking Oracle version" >&5
++echo "configure:71774: checking Oracle version" >&5
    for OCI_VER in $SUPPORTED_LIB_VERS; do
      if test -f $PDO_OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then
        PDO_OCI_VERSION="$OCI_VER"
-@@ -70632,7 +71610,7 @@
+@@ -70632,7 +71952,7 @@ echo "configure:70454: checking Oracle version" >&5
    done
  
    echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6
 -echo "configure:70636: checking for OCIEnvCreate in -lclntsh" >&5
-+echo "configure:71614: checking for OCIEnvCreate in -lclntsh" >&5
++echo "configure:71956: checking for OCIEnvCreate in -lclntsh" >&5
  ac_lib_var=`echo clntsh'_'OCIEnvCreate | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -70640,7 +71618,7 @@
+@@ -70640,7 +71960,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lclntsh  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 70644 "configure"
-+#line 71622 "configure"
++#line 71964 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -70651,7 +71629,7 @@
+@@ -70651,7 +71971,7 @@ int main() {
  OCIEnvCreate()
  ; return 0; }
  EOF
 -if { (eval echo configure:70655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:71633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:71975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -70785,7 +71763,7 @@
+@@ -70785,7 +72105,7 @@ fi
    done
  
    echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
 -echo "configure:70789: checking for OCIEnvNlsCreate in -lclntsh" >&5
-+echo "configure:71767: checking for OCIEnvNlsCreate in -lclntsh" >&5
++echo "configure:72109: checking for OCIEnvNlsCreate in -lclntsh" >&5
  ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -70793,7 +71771,7 @@
+@@ -70793,7 +72113,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lclntsh  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 70797 "configure"
-+#line 71775 "configure"
++#line 72117 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -70804,7 +71782,7 @@
+@@ -70804,7 +72124,7 @@ int main() {
  OCIEnvNlsCreate()
  ; return 0; }
  EOF
 -if { (eval echo configure:70808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:71786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:72128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -70938,7 +71916,7 @@
+@@ -70938,7 +72258,7 @@ fi
    done
  
    echo $ac_n "checking for OCILobIsTemporary in -lclntsh""... $ac_c" 1>&6
 -echo "configure:70942: checking for OCILobIsTemporary in -lclntsh" >&5
-+echo "configure:71920: checking for OCILobIsTemporary in -lclntsh" >&5
++echo "configure:72262: checking for OCILobIsTemporary in -lclntsh" >&5
  ac_lib_var=`echo clntsh'_'OCILobIsTemporary | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -70946,7 +71924,7 @@
+@@ -70946,7 +72266,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lclntsh  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 70950 "configure"
-+#line 71928 "configure"
++#line 72270 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -70957,7 +71935,7 @@
+@@ -70957,7 +72277,7 @@ int main() {
  OCILobIsTemporary()
  ; return 0; }
  EOF
 -if { (eval echo configure:70961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:71939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:72281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -71087,7 +72065,7 @@
+@@ -71087,7 +72407,7 @@ else
    done
  
    echo $ac_n "checking for OCILobIsTemporary in -locijdbc8""... $ac_c" 1>&6
 -echo "configure:71091: checking for OCILobIsTemporary in -locijdbc8" >&5
-+echo "configure:72069: checking for OCILobIsTemporary in -locijdbc8" >&5
++echo "configure:72411: checking for OCILobIsTemporary in -locijdbc8" >&5
  ac_lib_var=`echo ocijdbc8'_'OCILobIsTemporary | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -71095,7 +72073,7 @@
+@@ -71095,7 +72415,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-locijdbc8  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 71099 "configure"
-+#line 72077 "configure"
++#line 72419 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -71106,7 +72084,7 @@
+@@ -71106,7 +72426,7 @@ int main() {
  OCILobIsTemporary()
  ; return 0; }
  EOF
 -if { (eval echo configure:71110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:72088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:72430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -71267,7 +72245,7 @@
+@@ -71267,7 +72587,7 @@ fi
    done
  
    echo $ac_n "checking for OCICollAssign in -lclntsh""... $ac_c" 1>&6
 -echo "configure:71271: checking for OCICollAssign in -lclntsh" >&5
-+echo "configure:72249: checking for OCICollAssign in -lclntsh" >&5
++echo "configure:72591: checking for OCICollAssign in -lclntsh" >&5
  ac_lib_var=`echo clntsh'_'OCICollAssign | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -71275,7 +72253,7 @@
+@@ -71275,7 +72595,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lclntsh  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 71279 "configure"
-+#line 72257 "configure"
++#line 72599 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -71286,7 +72264,7 @@
+@@ -71286,7 +72606,7 @@ int main() {
  OCICollAssign()
  ; return 0; }
  EOF
 -if { (eval echo configure:71290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:72268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:72610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -71420,7 +72398,7 @@
+@@ -71420,7 +72740,7 @@ fi
    done
  
    echo $ac_n "checking for OCIStmtFetch2 in -lclntsh""... $ac_c" 1>&6
 -echo "configure:71424: checking for OCIStmtFetch2 in -lclntsh" >&5
-+echo "configure:72402: checking for OCIStmtFetch2 in -lclntsh" >&5
++echo "configure:72744: checking for OCIStmtFetch2 in -lclntsh" >&5
  ac_lib_var=`echo clntsh'_'OCIStmtFetch2 | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -71428,7 +72406,7 @@
+@@ -71428,7 +72748,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lclntsh  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 71432 "configure"
-+#line 72410 "configure"
++#line 72752 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -71439,7 +72417,7 @@
+@@ -71439,7 +72759,7 @@ int main() {
  OCIStmtFetch2()
  ; return 0; }
  EOF
 -if { (eval echo configure:71443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:72421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:72763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -71478,13 +72456,13 @@
+@@ -71478,13 +72798,13 @@ fi
    
      
    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
 -echo "configure:71482: checking for PDO includes" >&5
-+echo "configure:72460: checking for PDO includes" >&5
++echo "configure:72802: checking for PDO includes" >&5
  if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
      echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
 -echo "configure:71488: checking for PDO includes" >&5
-+echo "configure:72466: checking for PDO includes" >&5
++echo "configure:72808: checking for PDO includes" >&5
      if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
        pdo_inc_path=$abs_srcdir/ext
      elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
-@@ -71852,7 +72830,7 @@
+@@ -71852,7 +73172,7 @@ fi
  php_with_pdo_odbc=no
  
  echo $ac_n "checking for ODBC v3 support for PDO""... $ac_c" 1>&6
 -echo "configure:71856: checking for ODBC v3 support for PDO" >&5
-+echo "configure:72834: checking for ODBC v3 support for PDO" >&5
++echo "configure:73176: checking for ODBC v3 support for PDO" >&5
  # Check whether --with-pdo-odbc or --without-pdo-odbc was given.
  if test "${with_pdo_odbc+set}" = set; then
    withval="$with_pdo_odbc"
-@@ -71904,13 +72882,13 @@
+@@ -71904,13 +73224,13 @@ if test "$PHP_PDO_ODBC" != "no"; then
    
      
    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
 -echo "configure:71908: checking for PDO includes" >&5
-+echo "configure:72886: checking for PDO includes" >&5
++echo "configure:73228: checking for PDO includes" >&5
  if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
      echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
 -echo "configure:71914: checking for PDO includes" >&5
-+echo "configure:72892: checking for PDO includes" >&5
++echo "configure:73234: checking for PDO includes" >&5
      if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
        pdo_inc_path=$abs_srcdir/ext
      elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
-@@ -71931,7 +72909,7 @@
+@@ -71931,7 +73251,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6
    
  
    echo $ac_n "checking for selected PDO ODBC flavour""... $ac_c" 1>&6
 -echo "configure:71935: checking for selected PDO ODBC flavour" >&5
-+echo "configure:72913: checking for selected PDO ODBC flavour" >&5
++echo "configure:73255: checking for selected PDO ODBC flavour" >&5
  
    pdo_odbc_flavour="`echo $PHP_PDO_ODBC | cut -d, -f1`"
    pdo_odbc_dir="`echo $PHP_PDO_ODBC | cut -d, -f2`"
-@@ -72010,7 +72988,7 @@
+@@ -72010,7 +73330,7 @@ echo "configure:71935: checking for selected PDO ODBC flavour" >&5
  
    
    echo $ac_n "checking for odbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
 -echo "configure:72014: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:72992: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:73334: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
    if test -f "$PDO_ODBC_INCDIR/odbc.h"; then
      php_pdo_have_header=yes
      cat >> confdefs.h <<\EOF
-@@ -72024,7 +73002,7 @@
+@@ -72024,7 +73344,7 @@ EOF
  
    
    echo $ac_n "checking for odbcsdk.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
 -echo "configure:72028: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:73006: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:73348: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
    if test -f "$PDO_ODBC_INCDIR/odbcsdk.h"; then
      php_pdo_have_header=yes
      cat >> confdefs.h <<\EOF
-@@ -72038,7 +73016,7 @@
+@@ -72038,7 +73358,7 @@ EOF
  
    
    echo $ac_n "checking for iodbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
 -echo "configure:72042: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:73020: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:73362: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
    if test -f "$PDO_ODBC_INCDIR/iodbc.h"; then
      php_pdo_have_header=yes
      cat >> confdefs.h <<\EOF
-@@ -72052,7 +73030,7 @@
+@@ -72052,7 +73372,7 @@ EOF
  
    
    echo $ac_n "checking for sqlunix.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
 -echo "configure:72056: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:73034: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:73376: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
    if test -f "$PDO_ODBC_INCDIR/sqlunix.h"; then
      php_pdo_have_header=yes
      cat >> confdefs.h <<\EOF
-@@ -72066,7 +73044,7 @@
+@@ -72066,7 +73386,7 @@ EOF
  
    
    echo $ac_n "checking for sqltypes.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
 -echo "configure:72070: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:73048: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:73390: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
    if test -f "$PDO_ODBC_INCDIR/sqltypes.h"; then
      php_pdo_have_header=yes
      cat >> confdefs.h <<\EOF
-@@ -72080,7 +73058,7 @@
+@@ -72080,7 +73400,7 @@ EOF
  
    
    echo $ac_n "checking for sqlucode.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
 -echo "configure:72084: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:73062: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:73404: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
    if test -f "$PDO_ODBC_INCDIR/sqlucode.h"; then
      php_pdo_have_header=yes
      cat >> confdefs.h <<\EOF
-@@ -72094,7 +73072,7 @@
+@@ -72094,7 +73414,7 @@ EOF
  
    
    echo $ac_n "checking for sql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
 -echo "configure:72098: checking for sql.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:73076: checking for sql.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:73418: checking for sql.h in $PDO_ODBC_INCDIR" >&5
    if test -f "$PDO_ODBC_INCDIR/sql.h"; then
      php_pdo_have_header=yes
      cat >> confdefs.h <<\EOF
-@@ -72108,7 +73086,7 @@
+@@ -72108,7 +73428,7 @@ EOF
  
    
    echo $ac_n "checking for isql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
 -echo "configure:72112: checking for isql.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:73090: checking for isql.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:73432: checking for isql.h in $PDO_ODBC_INCDIR" >&5
    if test -f "$PDO_ODBC_INCDIR/isql.h"; then
      php_pdo_have_header=yes
      cat >> confdefs.h <<\EOF
-@@ -72122,7 +73100,7 @@
+@@ -72122,7 +73442,7 @@ EOF
  
    
    echo $ac_n "checking for sqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
 -echo "configure:72126: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:73104: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:73446: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
    if test -f "$PDO_ODBC_INCDIR/sqlext.h"; then
      php_pdo_have_header=yes
      cat >> confdefs.h <<\EOF
-@@ -72136,7 +73114,7 @@
+@@ -72136,7 +73456,7 @@ EOF
  
    
    echo $ac_n "checking for isqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
 -echo "configure:72140: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:73118: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:73460: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
    if test -f "$PDO_ODBC_INCDIR/isqlext.h"; then
      php_pdo_have_header=yes
      cat >> confdefs.h <<\EOF
-@@ -72150,7 +73128,7 @@
+@@ -72150,7 +73470,7 @@ EOF
  
    
    echo $ac_n "checking for udbcext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
 -echo "configure:72154: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:73132: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:73474: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
    if test -f "$PDO_ODBC_INCDIR/udbcext.h"; then
      php_pdo_have_header=yes
      cat >> confdefs.h <<\EOF
-@@ -72164,7 +73142,7 @@
+@@ -72164,7 +73484,7 @@ EOF
  
    
    echo $ac_n "checking for sqlcli1.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
 -echo "configure:72168: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:73146: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:73488: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
    if test -f "$PDO_ODBC_INCDIR/sqlcli1.h"; then
      php_pdo_have_header=yes
      cat >> confdefs.h <<\EOF
-@@ -72178,7 +73156,7 @@
+@@ -72178,7 +73498,7 @@ EOF
  
    
    echo $ac_n "checking for LibraryManager.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
 -echo "configure:72182: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:73160: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:73502: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
    if test -f "$PDO_ODBC_INCDIR/LibraryManager.h"; then
      php_pdo_have_header=yes
      cat >> confdefs.h <<\EOF
-@@ -72192,7 +73170,7 @@
+@@ -72192,7 +73512,7 @@ EOF
  
    
    echo $ac_n "checking for cli0core.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
 -echo "configure:72196: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:73174: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:73516: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
    if test -f "$PDO_ODBC_INCDIR/cli0core.h"; then
      php_pdo_have_header=yes
      cat >> confdefs.h <<\EOF
-@@ -72206,7 +73184,7 @@
+@@ -72206,7 +73526,7 @@ EOF
  
    
    echo $ac_n "checking for cli0ext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
 -echo "configure:72210: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:73188: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:73530: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
    if test -f "$PDO_ODBC_INCDIR/cli0ext.h"; then
      php_pdo_have_header=yes
      cat >> confdefs.h <<\EOF
-@@ -72220,7 +73198,7 @@
+@@ -72220,7 +73540,7 @@ EOF
  
    
    echo $ac_n "checking for cli0cli.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
 -echo "configure:72224: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:73202: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:73544: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
    if test -f "$PDO_ODBC_INCDIR/cli0cli.h"; then
      php_pdo_have_header=yes
      cat >> confdefs.h <<\EOF
-@@ -72234,7 +73212,7 @@
+@@ -72234,7 +73554,7 @@ EOF
  
    
    echo $ac_n "checking for cli0defs.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
 -echo "configure:72238: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:73216: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:73558: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
    if test -f "$PDO_ODBC_INCDIR/cli0defs.h"; then
      php_pdo_have_header=yes
      cat >> confdefs.h <<\EOF
-@@ -72248,7 +73226,7 @@
+@@ -72248,7 +73568,7 @@ EOF
  
    
    echo $ac_n "checking for cli0env.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6
 -echo "configure:72252: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
-+echo "configure:73230: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:73572: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
    if test -f "$PDO_ODBC_INCDIR/cli0env.h"; then
      php_pdo_have_header=yes
      cat >> confdefs.h <<\EOF
-@@ -72454,7 +73432,7 @@
+@@ -72454,7 +73774,7 @@ EOF
    done
  
    echo $ac_n "checking for SQLBindCol in -l$pdo_odbc_def_lib""... $ac_c" 1>&6
 -echo "configure:72458: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5
-+echo "configure:73436: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5
++echo "configure:73778: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5
  ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLBindCol | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -72462,7 +73440,7 @@
+@@ -72462,7 +73782,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$pdo_odbc_def_lib  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 72466 "configure"
-+#line 73444 "configure"
++#line 73786 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -72473,7 +73451,7 @@
+@@ -72473,7 +73793,7 @@ int main() {
  SQLBindCol()
  ; return 0; }
  EOF
 -if { (eval echo configure:72477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:73455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:73797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -72588,7 +73566,7 @@
+@@ -72588,7 +73908,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    done
  
    echo $ac_n "checking for SQLAllocHandle in -l$pdo_odbc_def_lib""... $ac_c" 1>&6
 -echo "configure:72592: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5
-+echo "configure:73570: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5
++echo "configure:73912: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5
  ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLAllocHandle | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -72596,7 +73574,7 @@
+@@ -72596,7 +73916,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$pdo_odbc_def_lib  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 72600 "configure"
-+#line 73578 "configure"
++#line 73920 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -72607,7 +73585,7 @@
+@@ -72607,7 +73927,7 @@ int main() {
  SQLAllocHandle()
  ; return 0; }
  EOF
 -if { (eval echo configure:72611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:73589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:73931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -72981,7 +73959,7 @@
+@@ -72981,7 +74301,7 @@ fi
  php_with_pdo_pgsql=no
  
  echo $ac_n "checking for PostgreSQL support for PDO""... $ac_c" 1>&6
 -echo "configure:72985: checking for PostgreSQL support for PDO" >&5
-+echo "configure:73963: checking for PostgreSQL support for PDO" >&5
++echo "configure:74305: checking for PostgreSQL support for PDO" >&5
  # Check whether --with-pdo-pgsql or --without-pdo-pgsql was given.
  if test "${with_pdo_pgsql+set}" = set; then
    withval="$with_pdo_pgsql"
-@@ -73040,7 +74018,7 @@
+@@ -73040,7 +74360,7 @@ if test "$PHP_PDO_PGSQL" != "no"; then
  
  
    echo $ac_n "checking for pg_config""... $ac_c" 1>&6
 -echo "configure:73044: checking for pg_config" >&5
-+echo "configure:74022: checking for pg_config" >&5
++echo "configure:74364: checking for pg_config" >&5
    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"
-@@ -73104,13 +74082,13 @@
+@@ -73104,13 +74424,13 @@ EOF
  
  
    echo $ac_n "checking for openssl dependencies""... $ac_c" 1>&6
 -echo "configure:73108: checking for openssl dependencies" >&5
-+echo "configure:74086: checking for openssl dependencies" >&5
++echo "configure:74428: checking for openssl dependencies" >&5
    if grep -q openssl $PGSQL_INCLUDE/libpq-fe.h ; then
      echo "$ac_t""yes" 1>&6
          # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:73114: checking for $ac_word" >&5
-+echo "configure:74092: checking for $ac_word" >&5
++echo "configure:74434: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -73154,7 +74132,7 @@
+@@ -73154,7 +74474,7 @@ fi
    old_LDFLAGS=$LDFLAGS
    LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
    echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6
 -echo "configure:73158: checking for PQparameterStatus in -lpq" >&5
-+echo "configure:74136: checking for PQparameterStatus in -lpq" >&5
++echo "configure:74478: checking for PQparameterStatus in -lpq" >&5
  ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -73162,7 +74140,7 @@
+@@ -73162,7 +74482,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 73166 "configure"
-+#line 74144 "configure"
++#line 74486 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -73173,7 +74151,7 @@
+@@ -73173,7 +74493,7 @@ int main() {
  PQparameterStatus()
  ; return 0; }
  EOF
 -if { (eval echo configure:73177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:74155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:74497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -73202,7 +74180,7 @@
+@@ -73202,7 +74522,7 @@ fi
  
  
    echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6
 -echo "configure:73206: checking for PQprepare in -lpq" >&5
-+echo "configure:74184: checking for PQprepare in -lpq" >&5
++echo "configure:74526: checking for PQprepare in -lpq" >&5
  ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -73210,7 +74188,7 @@
+@@ -73210,7 +74530,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 73214 "configure"
-+#line 74192 "configure"
++#line 74534 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -73221,7 +74199,7 @@
+@@ -73221,7 +74541,7 @@ int main() {
  PQprepare()
  ; return 0; }
  EOF
 -if { (eval echo configure:73225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:74203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:74545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -73245,7 +74223,7 @@
+@@ -73245,7 +74565,7 @@ else
  fi
  
    echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6
 -echo "configure:73249: checking for PQescapeStringConn in -lpq" >&5
-+echo "configure:74227: checking for PQescapeStringConn in -lpq" >&5
++echo "configure:74569: checking for PQescapeStringConn in -lpq" >&5
  ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -73253,7 +74231,7 @@
+@@ -73253,7 +74573,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 73257 "configure"
-+#line 74235 "configure"
++#line 74577 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -73264,7 +74242,7 @@
+@@ -73264,7 +74584,7 @@ int main() {
  PQescapeStringConn()
  ; return 0; }
  EOF
 -if { (eval echo configure:73268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:74246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:74588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -73288,7 +74266,7 @@
+@@ -73288,7 +74608,7 @@ else
  fi
  
    echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6
 -echo "configure:73292: checking for PQescapeByteaConn in -lpq" >&5
-+echo "configure:74270: checking for PQescapeByteaConn in -lpq" >&5
++echo "configure:74612: checking for PQescapeByteaConn in -lpq" >&5
  ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -73296,7 +74274,7 @@
+@@ -73296,7 +74616,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 73300 "configure"
-+#line 74278 "configure"
++#line 74620 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -73307,7 +74285,7 @@
+@@ -73307,7 +74627,7 @@ int main() {
  PQescapeByteaConn()
  ; return 0; }
  EOF
 -if { (eval echo configure:73311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:74289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:74631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -73332,7 +74310,7 @@
+@@ -73332,7 +74652,7 @@ fi
  
  
    echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6
 -echo "configure:73336: checking for pg_encoding_to_char in -lpq" >&5
-+echo "configure:74314: checking for pg_encoding_to_char in -lpq" >&5
++echo "configure:74656: checking for pg_encoding_to_char in -lpq" >&5
  ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -73340,7 +74318,7 @@
+@@ -73340,7 +74660,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 73344 "configure"
-+#line 74322 "configure"
++#line 74664 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -73351,7 +74329,7 @@
+@@ -73351,7 +74671,7 @@ int main() {
  pg_encoding_to_char()
  ; return 0; }
  EOF
 -if { (eval echo configure:73355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:74333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:74675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -73515,13 +74493,13 @@
+@@ -73515,13 +74835,13 @@ fi
    
      
    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
 -echo "configure:73519: checking for PDO includes" >&5
-+echo "configure:74497: checking for PDO includes" >&5
++echo "configure:74839: checking for PDO includes" >&5
  if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
      echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
 -echo "configure:73525: checking for PDO includes" >&5
-+echo "configure:74503: checking for PDO includes" >&5
++echo "configure:74845: checking for PDO includes" >&5
      if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
        pdo_inc_path=$abs_srcdir/ext
      elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
-@@ -73861,7 +74839,7 @@
+@@ -73861,7 +75181,7 @@ fi
  php_with_pdo_sqlite=$PHP_PDO
  
  echo $ac_n "checking for sqlite 3 support for PDO""... $ac_c" 1>&6
 -echo "configure:73865: checking for sqlite 3 support for PDO" >&5
-+echo "configure:74843: checking for sqlite 3 support for PDO" >&5
++echo "configure:75185: checking for sqlite 3 support for PDO" >&5
  # Check whether --with-pdo-sqlite or --without-pdo-sqlite was given.
  if test "${with_pdo_sqlite+set}" = set; then
    withval="$with_pdo_sqlite"
-@@ -73910,13 +74888,13 @@
+@@ -73910,13 +75230,13 @@ if test "$PHP_PDO_SQLITE" != "no"; then
    
      
    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
 -echo "configure:73914: checking for PDO includes" >&5
-+echo "configure:74892: checking for PDO includes" >&5
++echo "configure:75234: checking for PDO includes" >&5
  if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
      echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
 -echo "configure:73920: checking for PDO includes" >&5
-+echo "configure:74898: checking for PDO includes" >&5
++echo "configure:75240: checking for PDO includes" >&5
      if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
        pdo_inc_path=$abs_srcdir/ext
      elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
-@@ -73945,7 +74923,7 @@
+@@ -73945,7 +75265,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6
        PDO_SQLITE_DIR=$PHP_PDO_SQLITE
      else # search default path list
        echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6
 -echo "configure:73949: checking for sqlite3 files in default path" >&5
-+echo "configure:74927: checking for sqlite3 files in default path" >&5
++echo "configure:75269: checking for sqlite3 files in default path" >&5
        for i in $SEARCH_PATH ; do
          if test -r $i/$SEARCH_FOR; then
            PDO_SQLITE_DIR=$i
-@@ -74091,7 +75069,7 @@
+@@ -74091,7 +75411,7 @@ echo "configure:73949: checking for sqlite3 files in default path" >&5
    done
  
    echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6
 -echo "configure:74095: checking for $LIBSYMBOL in -l$LIBNAME" >&5
-+echo "configure:75073: checking for $LIBSYMBOL in -l$LIBNAME" >&5
++echo "configure:75415: checking for $LIBSYMBOL in -l$LIBNAME" >&5
  ac_lib_var=`echo $LIBNAME'_'$LIBSYMBOL | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -74099,7 +75077,7 @@
+@@ -74099,7 +75419,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$LIBNAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 74103 "configure"
-+#line 75081 "configure"
++#line 75423 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -74110,7 +75088,7 @@
+@@ -74110,7 +75430,7 @@ int main() {
  $LIBSYMBOL()
  ; return 0; }
  EOF
 -if { (eval echo configure:74114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:75092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:75434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -74340,7 +75318,7 @@
+@@ -74340,7 +75660,7 @@ fi
    done
  
    echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6
 -echo "configure:74344: checking for sqlite3_key in -lsqlite3" >&5
-+echo "configure:75322: checking for sqlite3_key in -lsqlite3" >&5
++echo "configure:75664: checking for sqlite3_key in -lsqlite3" >&5
  ac_lib_var=`echo sqlite3'_'sqlite3_key | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -74348,7 +75326,7 @@
+@@ -74348,7 +75668,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsqlite3  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 74352 "configure"
-+#line 75330 "configure"
++#line 75672 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -74359,7 +75337,7 @@
+@@ -74359,7 +75679,7 @@ int main() {
  sqlite3_key()
  ; return 0; }
  EOF
 -if { (eval echo configure:74363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:75341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:75683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -75100,12 +76078,12 @@
+@@ -75100,12 +76420,12 @@ but you've either not enabled sqlite3, or have disabled it.
        for ac_func in usleep nanosleep
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:75104: checking for $ac_func" >&5
-+echo "configure:76082: checking for $ac_func" >&5
++echo "configure:76424: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 75109 "configure"
-+#line 76087 "configure"
++#line 76429 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -75128,7 +76106,7 @@
+@@ -75128,7 +76448,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:75132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:76110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:76452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -75156,17 +76134,17 @@
+@@ -75156,17 +76476,17 @@ done
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:75160: checking for $ac_hdr" >&5
-+echo "configure:76138: checking for $ac_hdr" >&5
++echo "configure:76480: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 75165 "configure"
-+#line 76143 "configure"
++#line 76485 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:75170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:76148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:76490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -75290,7 +76268,7 @@
+@@ -75290,7 +76610,7 @@ done
    done
  
    echo $ac_n "checking for fdatasync in -lrt""... $ac_c" 1>&6
 -echo "configure:75294: checking for fdatasync in -lrt" >&5
-+echo "configure:76272: checking for fdatasync in -lrt" >&5
++echo "configure:76614: checking for fdatasync in -lrt" >&5
  ac_lib_var=`echo rt'_'fdatasync | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -75298,7 +76276,7 @@
+@@ -75298,7 +76618,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lrt  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75302 "configure"
-+#line 76280 "configure"
++#line 76622 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -75309,7 +76287,7 @@
+@@ -75309,7 +76629,7 @@ int main() {
  fdatasync()
  ; return 0; }
  EOF
 -if { (eval echo configure:75313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:76291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:76633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -75390,7 +76368,7 @@
+@@ -75390,7 +76710,7 @@ fi
  php_with_pgsql=no
  
  echo $ac_n "checking for PostgreSQL support""... $ac_c" 1>&6
 -echo "configure:75394: checking for PostgreSQL support" >&5
-+echo "configure:76372: checking for PostgreSQL support" >&5
++echo "configure:76714: checking for PostgreSQL support" >&5
  # Check whether --with-pgsql or --without-pgsql was given.
  if test "${with_pgsql+set}" = set; then
    withval="$with_pgsql"
-@@ -75444,7 +76422,7 @@
+@@ -75444,7 +76764,7 @@ if test "$PHP_PGSQL" != "no"; then
  
  
    echo $ac_n "checking for pg_config""... $ac_c" 1>&6
 -echo "configure:75448: checking for pg_config" >&5
-+echo "configure:76426: checking for pg_config" >&5
++echo "configure:76768: checking for pg_config" >&5
    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"
-@@ -75512,7 +76490,7 @@
+@@ -75512,7 +76832,7 @@ EOF
    old_LDFLAGS=$LDFLAGS
    LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS"
    echo $ac_n "checking for PQescapeString in -lpq""... $ac_c" 1>&6
 -echo "configure:75516: checking for PQescapeString in -lpq" >&5
-+echo "configure:76494: checking for PQescapeString in -lpq" >&5
++echo "configure:76836: checking for PQescapeString in -lpq" >&5
  ac_lib_var=`echo pq'_'PQescapeString | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -75520,7 +76498,7 @@
+@@ -75520,7 +76840,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75524 "configure"
-+#line 76502 "configure"
++#line 76844 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -75531,7 +76509,7 @@
+@@ -75531,7 +76851,7 @@ int main() {
  PQescapeString()
  ; return 0; }
  EOF
 -if { (eval echo configure:75535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:76513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:76855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -75555,7 +76533,7 @@
+@@ -75555,7 +76875,7 @@ else
  fi
  
    echo $ac_n "checking for PQunescapeBytea in -lpq""... $ac_c" 1>&6
 -echo "configure:75559: checking for PQunescapeBytea in -lpq" >&5
-+echo "configure:76537: checking for PQunescapeBytea in -lpq" >&5
++echo "configure:76879: checking for PQunescapeBytea in -lpq" >&5
  ac_lib_var=`echo pq'_'PQunescapeBytea | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -75563,7 +76541,7 @@
+@@ -75563,7 +76883,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75567 "configure"
-+#line 76545 "configure"
++#line 76887 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -75574,7 +76552,7 @@
+@@ -75574,7 +76894,7 @@ int main() {
  PQunescapeBytea()
  ; return 0; }
  EOF
 -if { (eval echo configure:75578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:76556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:76898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -75598,7 +76576,7 @@
+@@ -75598,7 +76918,7 @@ else
  fi
  
    echo $ac_n "checking for PQsetnonblocking in -lpq""... $ac_c" 1>&6
 -echo "configure:75602: checking for PQsetnonblocking in -lpq" >&5
-+echo "configure:76580: checking for PQsetnonblocking in -lpq" >&5
++echo "configure:76922: checking for PQsetnonblocking in -lpq" >&5
  ac_lib_var=`echo pq'_'PQsetnonblocking | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -75606,7 +76584,7 @@
+@@ -75606,7 +76926,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75610 "configure"
-+#line 76588 "configure"
++#line 76930 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -75617,7 +76595,7 @@
+@@ -75617,7 +76937,7 @@ int main() {
  PQsetnonblocking()
  ; return 0; }
  EOF
 -if { (eval echo configure:75621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:76599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:76941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -75641,7 +76619,7 @@
+@@ -75641,7 +76961,7 @@ else
  fi
  
    echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6
 -echo "configure:75645: checking for PQcmdTuples in -lpq" >&5
-+echo "configure:76623: checking for PQcmdTuples in -lpq" >&5
++echo "configure:76965: checking for PQcmdTuples in -lpq" >&5
  ac_lib_var=`echo pq'_'PQcmdTuples | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -75649,7 +76627,7 @@
+@@ -75649,7 +76969,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75653 "configure"
-+#line 76631 "configure"
++#line 76973 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -75660,7 +76638,7 @@
+@@ -75660,7 +76980,7 @@ int main() {
  PQcmdTuples()
  ; return 0; }
  EOF
 -if { (eval echo configure:75664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:76642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:76984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -75684,7 +76662,7 @@
+@@ -75684,7 +77004,7 @@ else
  fi
  
    echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6
 -echo "configure:75688: checking for PQoidValue in -lpq" >&5
-+echo "configure:76666: checking for PQoidValue in -lpq" >&5
++echo "configure:77008: checking for PQoidValue in -lpq" >&5
  ac_lib_var=`echo pq'_'PQoidValue | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -75692,7 +76670,7 @@
+@@ -75692,7 +77012,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75696 "configure"
-+#line 76674 "configure"
++#line 77016 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -75703,7 +76681,7 @@
+@@ -75703,7 +77023,7 @@ int main() {
  PQoidValue()
  ; return 0; }
  EOF
 -if { (eval echo configure:75707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:76685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -75727,7 +76705,7 @@
+@@ -75727,7 +77047,7 @@ else
  fi
  
    echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6
 -echo "configure:75731: checking for PQclientEncoding in -lpq" >&5
-+echo "configure:76709: checking for PQclientEncoding in -lpq" >&5
++echo "configure:77051: checking for PQclientEncoding in -lpq" >&5
  ac_lib_var=`echo pq'_'PQclientEncoding | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -75735,7 +76713,7 @@
+@@ -75735,7 +77055,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75739 "configure"
-+#line 76717 "configure"
++#line 77059 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -75746,7 +76724,7 @@
+@@ -75746,7 +77066,7 @@ int main() {
  PQclientEncoding()
  ; return 0; }
  EOF
 -if { (eval echo configure:75750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:76728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -75770,7 +76748,7 @@
+@@ -75770,7 +77090,7 @@ else
  fi
  
    echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6
 -echo "configure:75774: checking for PQparameterStatus in -lpq" >&5
-+echo "configure:76752: checking for PQparameterStatus in -lpq" >&5
++echo "configure:77094: checking for PQparameterStatus in -lpq" >&5
  ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -75778,7 +76756,7 @@
+@@ -75778,7 +77098,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75782 "configure"
-+#line 76760 "configure"
++#line 77102 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -75789,7 +76767,7 @@
+@@ -75789,7 +77109,7 @@ int main() {
  PQparameterStatus()
  ; return 0; }
  EOF
 -if { (eval echo configure:75793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:76771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -75813,7 +76791,7 @@
+@@ -75813,7 +77133,7 @@ else
  fi
  
    echo $ac_n "checking for PQprotocolVersion in -lpq""... $ac_c" 1>&6
 -echo "configure:75817: checking for PQprotocolVersion in -lpq" >&5
-+echo "configure:76795: checking for PQprotocolVersion in -lpq" >&5
++echo "configure:77137: checking for PQprotocolVersion in -lpq" >&5
  ac_lib_var=`echo pq'_'PQprotocolVersion | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -75821,7 +76799,7 @@
+@@ -75821,7 +77141,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75825 "configure"
-+#line 76803 "configure"
++#line 77145 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -75832,7 +76810,7 @@
+@@ -75832,7 +77152,7 @@ int main() {
  PQprotocolVersion()
  ; return 0; }
  EOF
 -if { (eval echo configure:75836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:76814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -75856,7 +76834,7 @@
+@@ -75856,7 +77176,7 @@ else
  fi
  
    echo $ac_n "checking for PQtransactionStatus in -lpq""... $ac_c" 1>&6
 -echo "configure:75860: checking for PQtransactionStatus in -lpq" >&5
-+echo "configure:76838: checking for PQtransactionStatus in -lpq" >&5
++echo "configure:77180: checking for PQtransactionStatus in -lpq" >&5
  ac_lib_var=`echo pq'_'PQtransactionStatus | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -75864,7 +76842,7 @@
+@@ -75864,7 +77184,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75868 "configure"
-+#line 76846 "configure"
++#line 77188 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -75875,7 +76853,7 @@
+@@ -75875,7 +77195,7 @@ int main() {
  PQtransactionStatus()
  ; return 0; }
  EOF
 -if { (eval echo configure:75879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:76857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -75899,7 +76877,7 @@
+@@ -75899,7 +77219,7 @@ else
  fi
  
    echo $ac_n "checking for PQexecParams in -lpq""... $ac_c" 1>&6
 -echo "configure:75903: checking for PQexecParams in -lpq" >&5
-+echo "configure:76881: checking for PQexecParams in -lpq" >&5
++echo "configure:77223: checking for PQexecParams in -lpq" >&5
  ac_lib_var=`echo pq'_'PQexecParams | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -75907,7 +76885,7 @@
+@@ -75907,7 +77227,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75911 "configure"
-+#line 76889 "configure"
++#line 77231 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -75918,7 +76896,7 @@
+@@ -75918,7 +77238,7 @@ int main() {
  PQexecParams()
  ; return 0; }
  EOF
 -if { (eval echo configure:75922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:76900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -75942,7 +76920,7 @@
+@@ -75942,7 +77262,7 @@ else
  fi
  
    echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6
 -echo "configure:75946: checking for PQprepare in -lpq" >&5
-+echo "configure:76924: checking for PQprepare in -lpq" >&5
++echo "configure:77266: checking for PQprepare in -lpq" >&5
  ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -75950,7 +76928,7 @@
+@@ -75950,7 +77270,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75954 "configure"
-+#line 76932 "configure"
++#line 77274 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -75961,7 +76939,7 @@
+@@ -75961,7 +77281,7 @@ int main() {
  PQprepare()
  ; return 0; }
  EOF
 -if { (eval echo configure:75965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:76943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -75985,7 +76963,7 @@
+@@ -75985,7 +77305,7 @@ else
  fi
  
    echo $ac_n "checking for PQexecPrepared in -lpq""... $ac_c" 1>&6
 -echo "configure:75989: checking for PQexecPrepared in -lpq" >&5
-+echo "configure:76967: checking for PQexecPrepared in -lpq" >&5
++echo "configure:77309: checking for PQexecPrepared in -lpq" >&5
  ac_lib_var=`echo pq'_'PQexecPrepared | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -75993,7 +76971,7 @@
+@@ -75993,7 +77313,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75997 "configure"
-+#line 76975 "configure"
++#line 77317 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -76004,7 +76982,7 @@
+@@ -76004,7 +77324,7 @@ int main() {
  PQexecPrepared()
  ; return 0; }
  EOF
 -if { (eval echo configure:76008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:76986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -76028,7 +77006,7 @@
+@@ -76028,7 +77348,7 @@ else
  fi
  
    echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6
 -echo "configure:76032: checking for PQresultErrorField in -lpq" >&5
-+echo "configure:77010: checking for PQresultErrorField in -lpq" >&5
++echo "configure:77352: checking for PQresultErrorField in -lpq" >&5
  ac_lib_var=`echo pq'_'PQresultErrorField | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -76036,7 +77014,7 @@
+@@ -76036,7 +77356,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76040 "configure"
-+#line 77018 "configure"
++#line 77360 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -76047,7 +77025,7 @@
+@@ -76047,7 +77367,7 @@ int main() {
  PQresultErrorField()
  ; return 0; }
  EOF
 -if { (eval echo configure:76051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -76071,7 +77049,7 @@
+@@ -76071,7 +77391,7 @@ else
  fi
  
    echo $ac_n "checking for PQsendQueryParams in -lpq""... $ac_c" 1>&6
 -echo "configure:76075: checking for PQsendQueryParams in -lpq" >&5
-+echo "configure:77053: checking for PQsendQueryParams in -lpq" >&5
++echo "configure:77395: checking for PQsendQueryParams in -lpq" >&5
  ac_lib_var=`echo pq'_'PQsendQueryParams | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -76079,7 +77057,7 @@
+@@ -76079,7 +77399,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76083 "configure"
-+#line 77061 "configure"
++#line 77403 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -76090,7 +77068,7 @@
+@@ -76090,7 +77410,7 @@ int main() {
  PQsendQueryParams()
  ; return 0; }
  EOF
 -if { (eval echo configure:76094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -76114,7 +77092,7 @@
+@@ -76114,7 +77434,7 @@ else
  fi
  
    echo $ac_n "checking for PQsendPrepare in -lpq""... $ac_c" 1>&6
 -echo "configure:76118: checking for PQsendPrepare in -lpq" >&5
-+echo "configure:77096: checking for PQsendPrepare in -lpq" >&5
++echo "configure:77438: checking for PQsendPrepare in -lpq" >&5
  ac_lib_var=`echo pq'_'PQsendPrepare | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -76122,7 +77100,7 @@
+@@ -76122,7 +77442,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76126 "configure"
-+#line 77104 "configure"
++#line 77446 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -76133,7 +77111,7 @@
+@@ -76133,7 +77453,7 @@ int main() {
  PQsendPrepare()
  ; return 0; }
  EOF
 -if { (eval echo configure:76137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -76157,7 +77135,7 @@
+@@ -76157,7 +77477,7 @@ else
  fi
  
    echo $ac_n "checking for PQsendQueryPrepared in -lpq""... $ac_c" 1>&6
 -echo "configure:76161: checking for PQsendQueryPrepared in -lpq" >&5
-+echo "configure:77139: checking for PQsendQueryPrepared in -lpq" >&5
++echo "configure:77481: checking for PQsendQueryPrepared in -lpq" >&5
  ac_lib_var=`echo pq'_'PQsendQueryPrepared | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -76165,7 +77143,7 @@
+@@ -76165,7 +77485,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76169 "configure"
-+#line 77147 "configure"
++#line 77489 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -76176,7 +77154,7 @@
+@@ -76176,7 +77496,7 @@ int main() {
  PQsendQueryPrepared()
  ; return 0; }
  EOF
 -if { (eval echo configure:76180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -76200,7 +77178,7 @@
+@@ -76200,7 +77520,7 @@ else
  fi
  
    echo $ac_n "checking for PQputCopyData in -lpq""... $ac_c" 1>&6
 -echo "configure:76204: checking for PQputCopyData in -lpq" >&5
-+echo "configure:77182: checking for PQputCopyData in -lpq" >&5
++echo "configure:77524: checking for PQputCopyData in -lpq" >&5
  ac_lib_var=`echo pq'_'PQputCopyData | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -76208,7 +77186,7 @@
+@@ -76208,7 +77528,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76212 "configure"
-+#line 77190 "configure"
++#line 77532 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -76219,7 +77197,7 @@
+@@ -76219,7 +77539,7 @@ int main() {
  PQputCopyData()
  ; return 0; }
  EOF
 -if { (eval echo configure:76223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -76243,7 +77221,7 @@
+@@ -76243,7 +77563,7 @@ else
  fi
  
    echo $ac_n "checking for PQputCopyEnd in -lpq""... $ac_c" 1>&6
 -echo "configure:76247: checking for PQputCopyEnd in -lpq" >&5
-+echo "configure:77225: checking for PQputCopyEnd in -lpq" >&5
++echo "configure:77567: checking for PQputCopyEnd in -lpq" >&5
  ac_lib_var=`echo pq'_'PQputCopyEnd | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -76251,7 +77229,7 @@
+@@ -76251,7 +77571,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76255 "configure"
-+#line 77233 "configure"
++#line 77575 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -76262,7 +77240,7 @@
+@@ -76262,7 +77582,7 @@ int main() {
  PQputCopyEnd()
  ; return 0; }
  EOF
 -if { (eval echo configure:76266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -76286,7 +77264,7 @@
+@@ -76286,7 +77606,7 @@ else
  fi
  
    echo $ac_n "checking for PQgetCopyData in -lpq""... $ac_c" 1>&6
 -echo "configure:76290: checking for PQgetCopyData in -lpq" >&5
-+echo "configure:77268: checking for PQgetCopyData in -lpq" >&5
++echo "configure:77610: checking for PQgetCopyData in -lpq" >&5
  ac_lib_var=`echo pq'_'PQgetCopyData | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -76294,7 +77272,7 @@
+@@ -76294,7 +77614,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76298 "configure"
-+#line 77276 "configure"
++#line 77618 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -76305,7 +77283,7 @@
+@@ -76305,7 +77625,7 @@ int main() {
  PQgetCopyData()
  ; return 0; }
  EOF
 -if { (eval echo configure:76309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -76329,7 +77307,7 @@
+@@ -76329,7 +77649,7 @@ else
  fi
  
    echo $ac_n "checking for PQfreemem in -lpq""... $ac_c" 1>&6
 -echo "configure:76333: checking for PQfreemem in -lpq" >&5
-+echo "configure:77311: checking for PQfreemem in -lpq" >&5
++echo "configure:77653: checking for PQfreemem in -lpq" >&5
  ac_lib_var=`echo pq'_'PQfreemem | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -76337,7 +77315,7 @@
+@@ -76337,7 +77657,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76341 "configure"
-+#line 77319 "configure"
++#line 77661 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -76348,7 +77326,7 @@
+@@ -76348,7 +77668,7 @@ int main() {
  PQfreemem()
  ; return 0; }
  EOF
 -if { (eval echo configure:76352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -76372,7 +77350,7 @@
+@@ -76372,7 +77692,7 @@ else
  fi
  
    echo $ac_n "checking for PQsetErrorVerbosity in -lpq""... $ac_c" 1>&6
 -echo "configure:76376: checking for PQsetErrorVerbosity in -lpq" >&5
-+echo "configure:77354: checking for PQsetErrorVerbosity in -lpq" >&5
++echo "configure:77696: checking for PQsetErrorVerbosity in -lpq" >&5
  ac_lib_var=`echo pq'_'PQsetErrorVerbosity | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -76380,7 +77358,7 @@
+@@ -76380,7 +77700,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76384 "configure"
-+#line 77362 "configure"
++#line 77704 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -76391,7 +77369,7 @@
+@@ -76391,7 +77711,7 @@ int main() {
  PQsetErrorVerbosity()
  ; return 0; }
  EOF
 -if { (eval echo configure:76395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -76415,7 +77393,7 @@
+@@ -76415,7 +77735,7 @@ else
  fi
  
    echo $ac_n "checking for PQftable in -lpq""... $ac_c" 1>&6
 -echo "configure:76419: checking for PQftable in -lpq" >&5
-+echo "configure:77397: checking for PQftable in -lpq" >&5
++echo "configure:77739: checking for PQftable in -lpq" >&5
  ac_lib_var=`echo pq'_'PQftable | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -76423,7 +77401,7 @@
+@@ -76423,7 +77743,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76427 "configure"
-+#line 77405 "configure"
++#line 77747 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -76434,7 +77412,7 @@
+@@ -76434,7 +77754,7 @@ int main() {
  PQftable()
  ; return 0; }
  EOF
 -if { (eval echo configure:76438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -76458,7 +77436,7 @@
+@@ -76458,7 +77778,7 @@ else
  fi
  
    echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6
 -echo "configure:76462: checking for PQescapeStringConn in -lpq" >&5
-+echo "configure:77440: checking for PQescapeStringConn in -lpq" >&5
++echo "configure:77782: checking for PQescapeStringConn in -lpq" >&5
  ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -76466,7 +77444,7 @@
+@@ -76466,7 +77786,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76470 "configure"
-+#line 77448 "configure"
++#line 77790 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -76477,7 +77455,7 @@
+@@ -76477,7 +77797,7 @@ int main() {
  PQescapeStringConn()
  ; return 0; }
  EOF
 -if { (eval echo configure:76481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -76501,7 +77479,7 @@
+@@ -76501,7 +77821,7 @@ else
  fi
  
    echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6
 -echo "configure:76505: checking for PQescapeByteaConn in -lpq" >&5
-+echo "configure:77483: checking for PQescapeByteaConn in -lpq" >&5
++echo "configure:77825: checking for PQescapeByteaConn in -lpq" >&5
  ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -76509,7 +77487,7 @@
+@@ -76509,7 +77829,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76513 "configure"
-+#line 77491 "configure"
++#line 77833 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -76520,7 +77498,7 @@
+@@ -76520,7 +77840,7 @@ int main() {
  PQescapeByteaConn()
  ; return 0; }
  EOF
 -if { (eval echo configure:76524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -76544,7 +77522,7 @@
+@@ -76544,7 +77864,7 @@ else
  fi
  
    echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6
 -echo "configure:76548: checking for pg_encoding_to_char in -lpq" >&5
-+echo "configure:77526: checking for pg_encoding_to_char in -lpq" >&5
++echo "configure:77868: checking for pg_encoding_to_char in -lpq" >&5
  ac_lib_var=`echo pq'_'pg_encoding_to_char | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -76552,7 +77530,7 @@
+@@ -76552,7 +77872,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76556 "configure"
-+#line 77534 "configure"
++#line 77876 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -76563,7 +77541,7 @@
+@@ -76563,7 +77883,7 @@ int main() {
  pg_encoding_to_char()
  ; return 0; }
  EOF
 -if { (eval echo configure:76567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -76587,7 +77565,7 @@
+@@ -76587,7 +77907,7 @@ else
  fi
  
    echo $ac_n "checking for lo_create in -lpq""... $ac_c" 1>&6
 -echo "configure:76591: checking for lo_create in -lpq" >&5
-+echo "configure:77569: checking for lo_create in -lpq" >&5
++echo "configure:77911: checking for lo_create in -lpq" >&5
  ac_lib_var=`echo pq'_'lo_create | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -76595,7 +77573,7 @@
+@@ -76595,7 +77915,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76599 "configure"
-+#line 77577 "configure"
++#line 77919 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -76606,7 +77584,7 @@
+@@ -76606,7 +77926,7 @@ int main() {
  lo_create()
  ; return 0; }
  EOF
 -if { (eval echo configure:76610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -76630,7 +77608,7 @@
+@@ -76630,7 +77950,7 @@ else
  fi
  
    echo $ac_n "checking for lo_import_with_oid in -lpq""... $ac_c" 1>&6
 -echo "configure:76634: checking for lo_import_with_oid in -lpq" >&5
-+echo "configure:77612: checking for lo_import_with_oid in -lpq" >&5
++echo "configure:77954: checking for lo_import_with_oid in -lpq" >&5
  ac_lib_var=`echo pq'_'lo_import_with_oid | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -76638,7 +77616,7 @@
+@@ -76638,7 +77958,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76642 "configure"
-+#line 77620 "configure"
++#line 77962 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -76649,7 +77627,7 @@
+@@ -76649,7 +77969,7 @@ int main() {
  lo_import_with_oid()
  ; return 0; }
  EOF
 -if { (eval echo configure:76653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:77631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -77109,7 +78087,7 @@
+@@ -77109,7 +78429,7 @@ fi
  php_enable_phar=yes
  
  echo $ac_n "checking for phar archive support""... $ac_c" 1>&6
 -echo "configure:77113: checking for phar archive support" >&5
-+echo "configure:78091: checking for phar archive support" >&5
++echo "configure:78433: checking for phar archive support" >&5
  # Check whether --enable-phar or --disable-phar was given.
  if test "${enable_phar+set}" = set; then
    enableval="$enable_phar"
-@@ -77443,7 +78421,7 @@
+@@ -77443,7 +78763,7 @@ EOF
    fi
  
    echo $ac_n "checking for phar openssl support""... $ac_c" 1>&6
 -echo "configure:77447: checking for phar openssl support" >&5
-+echo "configure:78425: checking for phar openssl support" >&5
++echo "configure:78767: checking for phar openssl support" >&5
    if test "$PHP_HASH_SHARED" != "yes"; then
      if test "$PHP_HASH" != "no"; then
        cat >> confdefs.h <<\EOF
-@@ -77518,7 +78496,7 @@
+@@ -77518,7 +78838,7 @@ fi
  php_enable_posix=yes
  
  echo $ac_n "checking whether to enable POSIX-like functions""... $ac_c" 1>&6
 -echo "configure:77522: checking whether to enable POSIX-like functions" >&5
-+echo "configure:78500: checking whether to enable POSIX-like functions" >&5
++echo "configure:78842: checking whether to enable POSIX-like functions" >&5
  # Check whether --enable-posix or --disable-posix was given.
  if test "${enable_posix+set}" = set; then
    enableval="$enable_posix"
-@@ -77860,17 +78838,17 @@
+@@ -77860,17 +79180,17 @@ EOF
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:77864: checking for $ac_hdr" >&5
-+echo "configure:78842: checking for $ac_hdr" >&5
++echo "configure:79184: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 77869 "configure"
-+#line 78847 "configure"
++#line 79189 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:77874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:78852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:79194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -77900,12 +78878,12 @@
+@@ -77900,12 +79220,12 @@ done
    for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:77904: checking for $ac_func" >&5
-+echo "configure:78882: checking for $ac_func" >&5
++echo "configure:79224: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 77909 "configure"
-+#line 78887 "configure"
++#line 79229 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -77928,7 +78906,7 @@
+@@ -77928,7 +79248,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:77932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:78910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:79252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -77954,14 +78932,14 @@
+@@ -77954,14 +79274,14 @@ done
  
  
    echo $ac_n "checking for working ttyname_r() implementation""... $ac_c" 1>&6
 -echo "configure:77958: checking for working ttyname_r() implementation" >&5
-+echo "configure:78936: checking for working ttyname_r() implementation" >&5
++echo "configure:79278: checking for working ttyname_r() implementation" >&5
    if test "$cross_compiling" = yes; then
    
      echo "$ac_t""no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" 1>&6
@@ -12822,1090 +13174,1090 @@
  else
    cat > conftest.$ac_ext <<EOF
 -#line 77965 "configure"
-+#line 78943 "configure"
++#line 79285 "configure"
  #include "confdefs.h"
  
  #include <unistd.h>
-@@ -77974,7 +78952,7 @@
+@@ -77974,7 +79294,7 @@ int main(int argc, char *argv[])
  }
    
  EOF
 -if { (eval echo configure:77978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:78956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:79298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      echo "$ac_t""yes" 1>&6
-@@ -77996,13 +78974,13 @@
+@@ -77996,13 +79316,13 @@ fi
  
  
    echo $ac_n "checking for utsname.domainname""... $ac_c" 1>&6
 -echo "configure:78000: checking for utsname.domainname" >&5
-+echo "configure:78978: checking for utsname.domainname" >&5
++echo "configure:79320: checking for utsname.domainname" >&5
  if eval "test \"`echo '$''{'ac_cv_have_utsname_domainname'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
      cat > conftest.$ac_ext <<EOF
 -#line 78006 "configure"
-+#line 78984 "configure"
++#line 79326 "configure"
  #include "confdefs.h"
  
        #define _GNU_SOURCE
-@@ -78014,7 +78992,7 @@
+@@ -78014,7 +79334,7 @@ int main() {
      
  ; return 0; }
  EOF
 -if { (eval echo configure:78018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:78996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:79338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
        ac_cv_have_utsname_domainname=yes
-@@ -78045,7 +79023,7 @@
+@@ -78045,7 +79365,7 @@ fi
  php_with_pspell=no
  
  echo $ac_n "checking for PSPELL support""... $ac_c" 1>&6
 -echo "configure:78049: checking for PSPELL support" >&5
-+echo "configure:79027: checking for PSPELL support" >&5
++echo "configure:79369: checking for PSPELL support" >&5
  # Check whether --with-pspell or --without-pspell was given.
  if test "${with_pspell+set}" = set; then
    withval="$with_pspell"
-@@ -78595,7 +79573,7 @@
+@@ -78595,7 +79915,7 @@ EOF
    done
  
    echo $ac_n "checking for new_aspell_config in -laspell""... $ac_c" 1>&6
 -echo "configure:78599: checking for new_aspell_config in -laspell" >&5
-+echo "configure:79577: checking for new_aspell_config in -laspell" >&5
++echo "configure:79919: checking for new_aspell_config in -laspell" >&5
  ac_lib_var=`echo aspell'_'new_aspell_config | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -78603,7 +79581,7 @@
+@@ -78603,7 +79923,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-laspell  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 78607 "configure"
-+#line 79585 "configure"
++#line 79927 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -78614,7 +79592,7 @@
+@@ -78614,7 +79934,7 @@ int main() {
  new_aspell_config()
  ; return 0; }
  EOF
 -if { (eval echo configure:78618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:79596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:79938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -78788,7 +79766,7 @@
+@@ -78788,7 +80108,7 @@ fi
  php_with_libedit=no
  
  echo $ac_n "checking for libedit readline replacement""... $ac_c" 1>&6
 -echo "configure:78792: checking for libedit readline replacement" >&5
-+echo "configure:79770: checking for libedit readline replacement" >&5
++echo "configure:80112: checking for libedit readline replacement" >&5
  # Check whether --with-libedit or --without-libedit was given.
  if test "${with_libedit+set}" = set; then
    withval="$with_libedit"
-@@ -78833,7 +79811,7 @@
+@@ -78833,7 +80153,7 @@ if test "$PHP_LIBEDIT" = "no"; then
  php_with_readline=no
  
  echo $ac_n "checking for readline support""... $ac_c" 1>&6
 -echo "configure:78837: checking for readline support" >&5
-+echo "configure:79815: checking for readline support" >&5
++echo "configure:80157: checking for readline support" >&5
  # Check whether --with-readline or --without-readline was given.
  if test "${with_readline+set}" = set; then
    withval="$with_readline"
-@@ -78919,7 +79897,7 @@
+@@ -78919,7 +80239,7 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
  
    PHP_READLINE_LIBS=""
    echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
 -echo "configure:78923: checking for tgetent in -lncurses" >&5
-+echo "configure:79901: checking for tgetent in -lncurses" >&5
++echo "configure:80243: checking for tgetent in -lncurses" >&5
  ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -78927,7 +79905,7 @@
+@@ -78927,7 +80247,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lncurses  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 78931 "configure"
-+#line 79909 "configure"
++#line 80251 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -78938,7 +79916,7 @@
+@@ -78938,7 +80258,7 @@ int main() {
  tgetent()
  ; return 0; }
  EOF
 -if { (eval echo configure:78942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:79920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:80262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -78983,7 +79961,7 @@
+@@ -78983,7 +80303,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
 -echo "configure:78987: checking for tgetent in -ltermcap" >&5
-+echo "configure:79965: checking for tgetent in -ltermcap" >&5
++echo "configure:80307: checking for tgetent in -ltermcap" >&5
  ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -78991,7 +79969,7 @@
+@@ -78991,7 +80311,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ltermcap  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 78995 "configure"
-+#line 79973 "configure"
++#line 80315 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -79002,7 +79980,7 @@
+@@ -79002,7 +80322,7 @@ int main() {
  tgetent()
  ; return 0; }
  EOF
 -if { (eval echo configure:79006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:79984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:80326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -79149,7 +80127,7 @@
+@@ -79149,7 +80469,7 @@ fi
    done
  
    echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
 -echo "configure:79153: checking for readline in -lreadline" >&5
-+echo "configure:80131: checking for readline in -lreadline" >&5
++echo "configure:80473: checking for readline in -lreadline" >&5
  ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -79157,7 +80135,7 @@
+@@ -79157,7 +80477,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lreadline  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 79161 "configure"
-+#line 80139 "configure"
++#line 80481 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -79168,7 +80146,7 @@
+@@ -79168,7 +80488,7 @@ int main() {
  readline()
  ; return 0; }
  EOF
 -if { (eval echo configure:79172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:80492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -79397,7 +80375,7 @@
+@@ -79397,7 +80717,7 @@ fi
    done
  
    echo $ac_n "checking for rl_pending_input in -lreadline""... $ac_c" 1>&6
 -echo "configure:79401: checking for rl_pending_input in -lreadline" >&5
-+echo "configure:80379: checking for rl_pending_input in -lreadline" >&5
++echo "configure:80721: checking for rl_pending_input in -lreadline" >&5
  ac_lib_var=`echo readline'_'rl_pending_input | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -79405,7 +80383,7 @@
+@@ -79405,7 +80725,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lreadline  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 79409 "configure"
-+#line 80387 "configure"
++#line 80729 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -79416,7 +80394,7 @@
+@@ -79416,7 +80736,7 @@ int main() {
  rl_pending_input()
  ; return 0; }
  EOF
 -if { (eval echo configure:79420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:80740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -79547,7 +80525,7 @@
+@@ -79547,7 +80867,7 @@ fi
    done
  
    echo $ac_n "checking for rl_callback_read_char in -lreadline""... $ac_c" 1>&6
 -echo "configure:79551: checking for rl_callback_read_char in -lreadline" >&5
-+echo "configure:80529: checking for rl_callback_read_char in -lreadline" >&5
++echo "configure:80871: checking for rl_callback_read_char in -lreadline" >&5
  ac_lib_var=`echo readline'_'rl_callback_read_char | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -79555,7 +80533,7 @@
+@@ -79555,7 +80875,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lreadline  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 79559 "configure"
-+#line 80537 "configure"
++#line 80879 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -79566,7 +80544,7 @@
+@@ -79566,7 +80886,7 @@ int main() {
  rl_callback_read_char()
  ; return 0; }
  EOF
 -if { (eval echo configure:79570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:80890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -79650,7 +80628,7 @@
+@@ -79650,7 +80970,7 @@ elif test "$PHP_LIBEDIT" != "no"; then
  
  
    echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
 -echo "configure:79654: checking for tgetent in -lncurses" >&5
-+echo "configure:80632: checking for tgetent in -lncurses" >&5
++echo "configure:80974: checking for tgetent in -lncurses" >&5
  ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -79658,7 +80636,7 @@
+@@ -79658,7 +80978,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lncurses  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 79662 "configure"
-+#line 80640 "configure"
++#line 80982 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -79669,7 +80647,7 @@
+@@ -79669,7 +80989,7 @@ int main() {
  tgetent()
  ; return 0; }
  EOF
 -if { (eval echo configure:79673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:80993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -79713,7 +80691,7 @@
+@@ -79713,7 +81033,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
 -echo "configure:79717: checking for tgetent in -ltermcap" >&5
-+echo "configure:80695: checking for tgetent in -ltermcap" >&5
++echo "configure:81037: checking for tgetent in -ltermcap" >&5
  ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -79721,7 +80699,7 @@
+@@ -79721,7 +81041,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ltermcap  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 79725 "configure"
-+#line 80703 "configure"
++#line 81045 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -79732,7 +80710,7 @@
+@@ -79732,7 +81052,7 @@ int main() {
  tgetent()
  ; return 0; }
  EOF
 -if { (eval echo configure:79736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:81056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -79878,7 +80856,7 @@
+@@ -79878,7 +81198,7 @@ fi
    done
  
    echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6
 -echo "configure:79882: checking for readline in -ledit" >&5
-+echo "configure:80860: checking for readline in -ledit" >&5
++echo "configure:81202: checking for readline in -ledit" >&5
  ac_lib_var=`echo edit'_'readline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -79886,7 +80864,7 @@
+@@ -79886,7 +81206,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ledit  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 79890 "configure"
-+#line 80868 "configure"
++#line 81210 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -79897,7 +80875,7 @@
+@@ -79897,7 +81217,7 @@ int main() {
  readline()
  ; return 0; }
  EOF
 -if { (eval echo configure:79901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:80879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:81221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -80038,12 +81016,12 @@
+@@ -80038,12 +81358,12 @@ if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then
    for ac_func in rl_completion_matches
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:80042: checking for $ac_func" >&5
-+echo "configure:81020: checking for $ac_func" >&5
++echo "configure:81362: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 80047 "configure"
-+#line 81025 "configure"
++#line 81367 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -80066,7 +81044,7 @@
+@@ -80066,7 +81386,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:80070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:81048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:81390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -80392,7 +81370,7 @@
+@@ -80392,7 +81712,7 @@ fi
  php_with_recode=no
  
  echo $ac_n "checking for recode support""... $ac_c" 1>&6
 -echo "configure:80396: checking for recode support" >&5
-+echo "configure:81374: checking for recode support" >&5
++echo "configure:81716: checking for recode support" >&5
  # Check whether --with-recode or --without-recode was given.
  if test "${with_recode+set}" = set; then
    withval="$with_recode"
-@@ -80556,7 +81534,7 @@
+@@ -80556,7 +81876,7 @@ if test "$PHP_RECODE" != "no"; then
    done
  
    echo $ac_n "checking for recode_format_table in -lrecode""... $ac_c" 1>&6
 -echo "configure:80560: checking for recode_format_table in -lrecode" >&5
-+echo "configure:81538: checking for recode_format_table in -lrecode" >&5
++echo "configure:81880: checking for recode_format_table in -lrecode" >&5
  ac_lib_var=`echo recode'_'recode_format_table | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -80564,7 +81542,7 @@
+@@ -80564,7 +81884,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lrecode  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 80568 "configure"
-+#line 81546 "configure"
++#line 81888 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -80575,7 +81553,7 @@
+@@ -80575,7 +81895,7 @@ int main() {
  recode_format_table()
  ; return 0; }
  EOF
 -if { (eval echo configure:80579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:81557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:81899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -80705,7 +81683,7 @@
+@@ -80705,7 +82025,7 @@ else
      LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB"
      LIBS="$LIBS -lrecode"
      cat > conftest.$ac_ext <<EOF
 -#line 80709 "configure"
-+#line 81687 "configure"
++#line 82029 "configure"
  #include "confdefs.h"
  
  char *program_name;
-@@ -80716,7 +81694,7 @@
+@@ -80716,7 +82036,7 @@ recode_format_table();
      
  ; return 0; }
  EOF
 -if { (eval echo configure:80720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:81698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:82040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    
        
-@@ -80879,17 +81857,17 @@
+@@ -80879,17 +82199,17 @@ EOF
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:80883: checking for $ac_hdr" >&5
-+echo "configure:81861: checking for $ac_hdr" >&5
++echo "configure:82203: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 80888 "configure"
-+#line 81866 "configure"
++#line 82208 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:80893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:81871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:82213: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -81512,7 +82490,7 @@
+@@ -81512,7 +82832,7 @@ EOF
  php_enable_session=yes
  
  echo $ac_n "checking whether to enable PHP sessions""... $ac_c" 1>&6
 -echo "configure:81516: checking whether to enable PHP sessions" >&5
-+echo "configure:82494: checking whether to enable PHP sessions" >&5
++echo "configure:82836: checking whether to enable PHP sessions" >&5
  # Check whether --enable-session or --disable-session was given.
  if test "${enable_session+set}" = set; then
    enableval="$enable_session"
-@@ -81556,7 +82534,7 @@
+@@ -81556,7 +82876,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_with_mm=no
  
  echo $ac_n "checking for mm support""... $ac_c" 1>&6
 -echo "configure:81560: checking for mm support" >&5
-+echo "configure:82538: checking for mm support" >&5
++echo "configure:82880: checking for mm support" >&5
  # Check whether --with-mm or --without-mm was given.
  if test "${with_mm+set}" = set; then
    withval="$with_mm"
-@@ -81578,7 +82556,7 @@
+@@ -81578,7 +82898,7 @@ echo "$ac_t""$ext_output" 1>&6
  if test "$PHP_SESSION" != "no"; then
    
    echo $ac_n "checking whether pwrite works""... $ac_c" 1>&6
 -echo "configure:81582: checking whether pwrite works" >&5
-+echo "configure:82560: checking whether pwrite works" >&5
++echo "configure:82902: checking whether pwrite works" >&5
  if eval "test \"`echo '$''{'ac_cv_pwrite'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -81590,7 +82568,7 @@
+@@ -81590,7 +82910,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 81594 "configure"
-+#line 82572 "configure"
++#line 82914 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -81611,7 +82589,7 @@
+@@ -81611,7 +82931,7 @@ else
  
    
  EOF
 -if { (eval echo configure:81615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:82593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:82935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      ac_cv_pwrite=yes
-@@ -81636,7 +82614,7 @@
+@@ -81636,7 +82956,7 @@ fi
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 81640 "configure"
-+#line 82618 "configure"
++#line 82960 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -81657,7 +82635,7 @@
+@@ -81657,7 +82977,7 @@ ssize_t pwrite(int, void *, size_t, off64_t);
  
    
  EOF
 -if { (eval echo configure:81661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:82639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:82981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      ac_cv_pwrite=yes
-@@ -81698,7 +82676,7 @@
+@@ -81698,7 +83018,7 @@ EOF
  
    
    echo $ac_n "checking whether pread works""... $ac_c" 1>&6
 -echo "configure:81702: checking whether pread works" >&5
-+echo "configure:82680: checking whether pread works" >&5
++echo "configure:83022: checking whether pread works" >&5
  if eval "test \"`echo '$''{'ac_cv_pread'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -81711,7 +82689,7 @@
+@@ -81711,7 +83031,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 81715 "configure"
-+#line 82693 "configure"
++#line 83035 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -81731,7 +82709,7 @@
+@@ -81731,7 +83051,7 @@ else
      }
    
  EOF
 -if { (eval echo configure:81735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:82713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:83055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      ac_cv_pread=yes
-@@ -81758,7 +82736,7 @@
+@@ -81758,7 +83078,7 @@ fi
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 81762 "configure"
-+#line 82740 "configure"
++#line 83082 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -81778,7 +82756,7 @@
+@@ -81778,7 +83098,7 @@ ssize_t pread(int, void *, size_t, off64_t);
      }
    
  EOF
 -if { (eval echo configure:81782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:82760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:83102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      ac_cv_pread=yes
-@@ -82342,7 +83320,7 @@
+@@ -82342,7 +83662,7 @@ fi
  php_enable_shmop=no
  
  echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6
 -echo "configure:82346: checking whether to enable shmop support" >&5
-+echo "configure:83324: checking whether to enable shmop support" >&5
++echo "configure:83666: checking whether to enable shmop support" >&5
  # Check whether --enable-shmop or --disable-shmop was given.
  if test "${enable_shmop+set}" = set; then
    enableval="$enable_shmop"
-@@ -82686,7 +83664,7 @@
+@@ -82686,7 +84006,7 @@ fi
  php_enable_simplexml=yes
  
  echo $ac_n "checking whether to enable SimpleXML support""... $ac_c" 1>&6
 -echo "configure:82690: checking whether to enable SimpleXML support" >&5
-+echo "configure:83668: checking whether to enable SimpleXML support" >&5
++echo "configure:84010: checking whether to enable SimpleXML support" >&5
  # Check whether --enable-simplexml or --disable-simplexml was given.
  if test "${enable_simplexml+set}" = set; then
    enableval="$enable_simplexml"
-@@ -82731,7 +83709,7 @@
+@@ -82731,7 +84051,7 @@ if test -z "$PHP_LIBXML_DIR"; then
  php_with_libxml_dir=no
  
  echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
 -echo "configure:82735: checking libxml2 install dir" >&5
-+echo "configure:83713: checking libxml2 install dir" >&5
++echo "configure:84055: checking libxml2 install dir" >&5
  # Check whether --with-libxml-dir or --without-libxml-dir was given.
  if test "${with_libxml_dir+set}" = set; then
    withval="$with_libxml_dir"
-@@ -82759,7 +83737,7 @@
+@@ -82759,7 +84079,7 @@ if test "$PHP_SIMPLEXML" != "no"; then
  
    
  echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
 -echo "configure:82763: checking for xml2-config path" >&5
-+echo "configure:83741: checking for xml2-config path" >&5
++echo "configure:84083: checking for xml2-config path" >&5
  if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -82917,7 +83895,7 @@
+@@ -82917,7 +84237,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
  
  
              echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
 -echo "configure:82921: checking whether libxml build works" >&5
-+echo "configure:83899: checking whether libxml build works" >&5
++echo "configure:84241: checking whether libxml build works" >&5
  if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -82933,7 +83911,7 @@
+@@ -82933,7 +84253,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 82937 "configure"
-+#line 83915 "configure"
++#line 84257 "configure"
  #include "confdefs.h"
  
      
-@@ -82944,7 +83922,7 @@
+@@ -82944,7 +84264,7 @@ else
      }
    
  EOF
 -if { (eval echo configure:82948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:83926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:84268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      LIBS=$old_LIBS
-@@ -83332,7 +84310,7 @@
+@@ -83332,7 +84652,7 @@ fi
  php_with_snmp=no
  
  echo $ac_n "checking for SNMP support""... $ac_c" 1>&6
 -echo "configure:83336: checking for SNMP support" >&5
-+echo "configure:84314: checking for SNMP support" >&5
++echo "configure:84656: checking for SNMP support" >&5
  # Check whether --with-snmp or --without-snmp was given.
  if test "${with_snmp+set}" = set; then
    withval="$with_snmp"
-@@ -83376,7 +84354,7 @@
+@@ -83376,7 +84696,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_with_openssl_dir=no
  
  echo $ac_n "checking OpenSSL dir for SNMP""... $ac_c" 1>&6
 -echo "configure:83380: checking OpenSSL dir for SNMP" >&5
-+echo "configure:84358: checking OpenSSL dir for SNMP" >&5
++echo "configure:84700: checking OpenSSL dir for SNMP" >&5
  # Check whether --with-openssl-dir or --without-openssl-dir was given.
  if test "${with_openssl_dir+set}" = set; then
    withval="$with_openssl_dir"
-@@ -83399,7 +84377,7 @@
+@@ -83399,7 +84719,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_enable_ucd_snmp_hack=no
  
  echo $ac_n "checking whether to enable UCD SNMP hack""... $ac_c" 1>&6
 -echo "configure:83403: checking whether to enable UCD SNMP hack" >&5
-+echo "configure:84381: checking whether to enable UCD SNMP hack" >&5
++echo "configure:84723: checking whether to enable UCD SNMP hack" >&5
  # Check whether --enable-ucd-snmp-hack or --disable-ucd-snmp-hack was given.
  if test "${enable_ucd_snmp_hack+set}" = set; then
    enableval="$enable_ucd_snmp_hack"
-@@ -83424,7 +84402,7 @@
+@@ -83424,7 +84744,7 @@ if test "$PHP_SNMP" != "no"; then
      # Extract the first word of "net-snmp-config", so it can be a program name with args.
  set dummy net-snmp-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:83428: checking for $ac_word" >&5
-+echo "configure:84406: checking for $ac_word" >&5
++echo "configure:84748: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_SNMP_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -83625,17 +84603,17 @@
+@@ -83625,17 +84945,17 @@ EOF
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:83629: checking for $ac_hdr" >&5
-+echo "configure:84607: checking for $ac_hdr" >&5
++echo "configure:84949: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 83634 "configure"
-+#line 84612 "configure"
++#line 84954 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:83639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:84617: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:84959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -83663,9 +84641,9 @@
+@@ -83663,9 +84983,9 @@ done
  
      if test "$ac_cv_header_default_store_h" = "yes"; then
        echo $ac_n "checking for OpenSSL support in SNMP libraries""... $ac_c" 1>&6
 -echo "configure:83667: checking for OpenSSL support in SNMP libraries" >&5
-+echo "configure:84645: checking for OpenSSL support in SNMP libraries" >&5
++echo "configure:84987: checking for OpenSSL support in SNMP libraries" >&5
        cat > conftest.$ac_ext <<EOF
 -#line 83669 "configure"
-+#line 84647 "configure"
++#line 84989 "configure"
  #include "confdefs.h"
  
  #include <ucd-snmp-config.h>
-@@ -83720,7 +84698,7 @@
+@@ -83720,7 +85040,7 @@ rm -f conftest*
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:83724: checking for $ac_word" >&5
-+echo "configure:84702: checking for $ac_word" >&5
++echo "configure:85044: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -83925,9 +84903,9 @@
+@@ -83925,9 +85245,9 @@ fi
      old_CPPFLAGS=$CPPFLAGS
      CPPFLAGS=-I$OPENSSL_INCDIR
      echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6
 -echo "configure:83929: checking for OpenSSL version" >&5
-+echo "configure:84907: checking for OpenSSL version" >&5
++echo "configure:85249: checking for OpenSSL version" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 83931 "configure"
-+#line 84909 "configure"
++#line 85251 "configure"
  #include "confdefs.h"
  
  #include <openssl/opensslv.h>
-@@ -84082,7 +85060,7 @@
+@@ -84082,7 +85402,7 @@ rm -f conftest*
    done
  
    echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6
 -echo "configure:84086: checking for CRYPTO_free in -lcrypto" >&5
-+echo "configure:85064: checking for CRYPTO_free in -lcrypto" >&5
++echo "configure:85406: checking for CRYPTO_free in -lcrypto" >&5
  ac_lib_var=`echo crypto'_'CRYPTO_free | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -84090,7 +85068,7 @@
+@@ -84090,7 +85410,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lcrypto  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 84094 "configure"
-+#line 85072 "configure"
++#line 85414 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -84101,7 +85079,7 @@
+@@ -84101,7 +85421,7 @@ int main() {
  CRYPTO_free()
  ; return 0; }
  EOF
 -if { (eval echo configure:84105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:85083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:85425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -84258,7 +85236,7 @@
+@@ -84258,7 +85578,7 @@ fi
    done
  
    echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6
 -echo "configure:84262: checking for SSL_CTX_set_ssl_version in -lssl" >&5
-+echo "configure:85240: checking for SSL_CTX_set_ssl_version in -lssl" >&5
++echo "configure:85582: checking for SSL_CTX_set_ssl_version in -lssl" >&5
  ac_lib_var=`echo ssl'_'SSL_CTX_set_ssl_version | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -84266,7 +85244,7 @@
+@@ -84266,7 +85586,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lssl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 84270 "configure"
-+#line 85248 "configure"
++#line 85590 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -84277,7 +85255,7 @@
+@@ -84277,7 +85597,7 @@ int main() {
  SSL_CTX_set_ssl_version()
  ; return 0; }
  EOF
 -if { (eval echo configure:84281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:85259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:85601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -84390,7 +85368,7 @@
+@@ -84390,7 +85710,7 @@ else
      fi
  
      echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6
 -echo "configure:84394: checking for kstat_read in -lkstat" >&5
-+echo "configure:85372: checking for kstat_read in -lkstat" >&5
++echo "configure:85714: checking for kstat_read in -lkstat" >&5
  ac_lib_var=`echo kstat'_'kstat_read | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -84398,7 +85376,7 @@
+@@ -84398,7 +85718,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lkstat  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 84402 "configure"
-+#line 85380 "configure"
++#line 85722 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -84409,7 +85387,7 @@
+@@ -84409,7 +85729,7 @@ int main() {
  kstat_read()
  ; return 0; }
  EOF
 -if { (eval echo configure:84413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:85391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:85733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -84680,7 +85658,7 @@
+@@ -84680,7 +86000,7 @@ fi
    done
  
    echo $ac_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME""... $ac_c" 1>&6
 -echo "configure:84684: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5
-+echo "configure:85662: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5
++echo "configure:86004: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5
  ac_lib_var=`echo $SNMP_LIBNAME'_'snmp_parse_oid | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -84688,7 +85666,7 @@
+@@ -84688,7 +86008,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$SNMP_LIBNAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 84692 "configure"
-+#line 85670 "configure"
++#line 86012 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -84699,7 +85677,7 @@
+@@ -84699,7 +86019,7 @@ int main() {
  snmp_parse_oid()
  ; return 0; }
  EOF
 -if { (eval echo configure:84703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:85681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:86023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -84833,7 +85811,7 @@
+@@ -84833,7 +86153,7 @@ fi
    done
  
    echo $ac_n "checking for init_snmp in -l$SNMP_LIBNAME""... $ac_c" 1>&6
 -echo "configure:84837: checking for init_snmp in -l$SNMP_LIBNAME" >&5
-+echo "configure:85815: checking for init_snmp in -l$SNMP_LIBNAME" >&5
++echo "configure:86157: checking for init_snmp in -l$SNMP_LIBNAME" >&5
  ac_lib_var=`echo $SNMP_LIBNAME'_'init_snmp | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -84841,7 +85819,7 @@
+@@ -84841,7 +86161,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$SNMP_LIBNAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 84845 "configure"
-+#line 85823 "configure"
++#line 86165 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -84852,7 +85830,7 @@
+@@ -84852,7 +86172,7 @@ int main() {
  init_snmp()
  ; return 0; }
  EOF
 -if { (eval echo configure:84856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:85834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:86176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -85199,7 +86177,7 @@
+@@ -85199,7 +86519,7 @@ fi
  php_enable_soap=no
  
  echo $ac_n "checking whether to enable SOAP support""... $ac_c" 1>&6
 -echo "configure:85203: checking whether to enable SOAP support" >&5
-+echo "configure:86181: checking whether to enable SOAP support" >&5
++echo "configure:86523: checking whether to enable SOAP support" >&5
  # Check whether --enable-soap or --disable-soap was given.
  if test "${enable_soap+set}" = set; then
    enableval="$enable_soap"
-@@ -85244,7 +86222,7 @@
+@@ -85244,7 +86564,7 @@ if test -z "$PHP_LIBXML_DIR"; then
  php_with_libxml_dir=no
  
  echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
 -echo "configure:85248: checking libxml2 install dir" >&5
-+echo "configure:86226: checking libxml2 install dir" >&5
++echo "configure:86568: checking libxml2 install dir" >&5
  # Check whether --with-libxml-dir or --without-libxml-dir was given.
  if test "${with_libxml_dir+set}" = set; then
    withval="$with_libxml_dir"
-@@ -85272,7 +86250,7 @@
+@@ -85272,7 +86592,7 @@ if test "$PHP_SOAP" != "no"; then
  
    
  echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
 -echo "configure:85276: checking for xml2-config path" >&5
-+echo "configure:86254: checking for xml2-config path" >&5
++echo "configure:86596: checking for xml2-config path" >&5
  if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -85430,7 +86408,7 @@
+@@ -85430,7 +86750,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
  
  
              echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
 -echo "configure:85434: checking whether libxml build works" >&5
-+echo "configure:86412: checking whether libxml build works" >&5
++echo "configure:86754: checking whether libxml build works" >&5
  if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -85446,7 +86424,7 @@
+@@ -85446,7 +86766,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 85450 "configure"
-+#line 86428 "configure"
++#line 86770 "configure"
  #include "confdefs.h"
  
      
-@@ -85457,7 +86435,7 @@
+@@ -85457,7 +86777,7 @@ else
      }
    
  EOF
 -if { (eval echo configure:85461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:86439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:86781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      LIBS=$old_LIBS
-@@ -85807,7 +86785,7 @@
+@@ -85807,7 +87127,7 @@ fi
  php_enable_sockets=no
  
  echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6
 -echo "configure:85811: checking whether to enable sockets support" >&5
-+echo "configure:86789: checking whether to enable sockets support" >&5
++echo "configure:87131: checking whether to enable sockets support" >&5
  # Check whether --enable-sockets or --disable-sockets was given.
  if test "${enable_sockets+set}" = set; then
    enableval="$enable_sockets"
-@@ -85849,13 +86827,13 @@
+@@ -85849,13 +87169,13 @@ echo "$ac_t""$ext_output" 1>&6
  
  if test "$PHP_SOCKETS" != "no"; then
      echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6
 -echo "configure:85853: checking for struct cmsghdr" >&5
-+echo "configure:86831: checking for struct cmsghdr" >&5
++echo "configure:87173: checking for struct cmsghdr" >&5
  if eval "test \"`echo '$''{'ac_cv_cmsghdr'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
      cat > conftest.$ac_ext <<EOF
 -#line 85859 "configure"
-+#line 86837 "configure"
++#line 87179 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -85864,7 +86842,7 @@
+@@ -85864,7 +87184,7 @@ int main() {
  struct cmsghdr s; s
  ; return 0; }
  EOF
 -if { (eval echo configure:85868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:86846: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:87188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_cmsghdr=yes
  else
-@@ -85889,12 +86867,12 @@
+@@ -85889,12 +87209,12 @@ EOF
    for ac_func in hstrerror socketpair
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:85893: checking for $ac_func" >&5
-+echo "configure:86871: checking for $ac_func" >&5
++echo "configure:87213: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 85898 "configure"
-+#line 86876 "configure"
++#line 87218 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -85917,7 +86895,7 @@
+@@ -85917,7 +87237,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:85921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:86899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:87241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -85945,17 +86923,17 @@
+@@ -85945,17 +87265,17 @@ done
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:85949: checking for $ac_hdr" >&5
-+echo "configure:86927: checking for $ac_hdr" >&5
++echo "configure:87269: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 85954 "configure"
-+#line 86932 "configure"
++#line 87274 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:85959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:86937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:87279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -85982,7 +86960,7 @@
+@@ -85982,7 +87302,7 @@ fi
  done
  
    cat > conftest.$ac_ext <<EOF
 -#line 85986 "configure"
-+#line 86964 "configure"
++#line 87306 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -85992,7 +86970,7 @@
+@@ -85992,7 +87312,7 @@ int main() {
  static struct msghdr tp; int n = (int) tp.msg_flags; return n
  ; return 0; }
  EOF
 -if { (eval echo configure:85996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:86974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:87316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -86326,7 +87304,7 @@
+@@ -86326,7 +87646,7 @@ fi
  
  
    echo $ac_n "checking whether zend_object_value is packed""... $ac_c" 1>&6
 -echo "configure:86330: checking whether zend_object_value is packed" >&5
-+echo "configure:87308: checking whether zend_object_value is packed" >&5
++echo "configure:87650: checking whether zend_object_value is packed" >&5
    old_CPPFLAGS=$CPPFLAGS
    CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS"
    if test "$cross_compiling" = yes; then
-@@ -86336,7 +87314,7 @@
+@@ -86336,7 +87656,7 @@ echo "configure:86330: checking whether zend_object_value is packed" >&5
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 86340 "configure"
-+#line 87318 "configure"
++#line 87660 "configure"
  #include "confdefs.h"
  
  #include "Zend/zend_types.h"
-@@ -86345,7 +87323,7 @@
+@@ -86345,7 +87665,7 @@ int main(int argc, char **argv) {
  }
    
  EOF
 -if { (eval echo configure:86349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:87327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:87669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      ac_result=1
-@@ -86709,7 +87687,7 @@
+@@ -86709,7 +88029,7 @@ but you've either not enabled pcre, or have disabled it.
  php_with_sqlite=yes
  
  echo $ac_n "checking for sqlite support""... $ac_c" 1>&6
 -echo "configure:86713: checking for sqlite support" >&5
-+echo "configure:87691: checking for sqlite support" >&5
++echo "configure:88033: checking for sqlite support" >&5
  # Check whether --with-sqlite or --without-sqlite was given.
  if test "${with_sqlite+set}" = set; then
    withval="$with_sqlite"
-@@ -86753,7 +87731,7 @@
+@@ -86753,7 +88073,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_enable_sqlite_utf8=no
  
  echo $ac_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)""... $ac_c" 1>&6
 -echo "configure:86757: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5
-+echo "configure:87735: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5
++echo "configure:88077: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5
  # Check whether --enable-sqlite-utf8 or --disable-sqlite-utf8 was given.
  if test "${enable_sqlite_utf8+set}" = set; then
    enableval="$enable_sqlite_utf8"
-@@ -86781,13 +87759,13 @@
+@@ -86781,13 +88101,13 @@ if test "$PHP_SQLITE" != "no"; then
    if test "$PHP_PDO" != "no"; then
      
    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
 -echo "configure:86785: checking for PDO includes" >&5
-+echo "configure:87763: checking for PDO includes" >&5
++echo "configure:88105: checking for PDO includes" >&5
  if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
      echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
 -echo "configure:86791: checking for PDO includes" >&5
-+echo "configure:87769: checking for PDO includes" >&5
++echo "configure:88111: checking for PDO includes" >&5
      if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
        pdo_inc_path=$abs_srcdir/ext
      elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
-@@ -86821,7 +87799,7 @@
+@@ -86821,7 +88141,7 @@ EOF
        SQLITE_DIR=$PHP_SQLITE
      else # search default path list
        echo $ac_n "checking for sqlite files in default path""... $ac_c" 1>&6
 -echo "configure:86825: checking for sqlite files in default path" >&5
-+echo "configure:87803: checking for sqlite files in default path" >&5
++echo "configure:88145: checking for sqlite files in default path" >&5
        for i in $SEARCH_PATH ; do
          if test -r $i/$SEARCH_FOR; then
            SQLITE_DIR=$i
-@@ -86933,7 +87911,7 @@
+@@ -86933,7 +88253,7 @@ echo "configure:86825: checking for sqlite files in default path" >&5
    done
  
    echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6
 -echo "configure:86937: checking for sqlite_open in -lsqlite" >&5
-+echo "configure:87915: checking for sqlite_open in -lsqlite" >&5
++echo "configure:88257: checking for sqlite_open in -lsqlite" >&5
  ac_lib_var=`echo sqlite'_'sqlite_open | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -86941,7 +87919,7 @@
+@@ -86941,7 +88261,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsqlite  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 86945 "configure"
-+#line 87923 "configure"
++#line 88265 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -86952,7 +87930,7 @@
+@@ -86952,7 +88272,7 @@ int main() {
  sqlite_open()
  ; return 0; }
  EOF
 -if { (eval echo configure:86956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:87934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:88276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -87125,7 +88103,7 @@
+@@ -87125,7 +88445,7 @@ fi
    # Extract the first word of "lemon", so it can be a program name with args.
  set dummy lemon; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:87129: checking for $ac_word" >&5
-+echo "configure:88107: checking for $ac_word" >&5
++echo "configure:88449: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_LEMON'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -87153,7 +88131,7 @@
+@@ -87153,7 +88473,7 @@ fi
  
    if test "$LEMON"; then
      echo $ac_n "checking for lemon version""... $ac_c" 1>&6
 -echo "configure:87157: checking for lemon version" >&5
-+echo "configure:88135: checking for lemon version" >&5
++echo "configure:88477: checking for lemon version" >&5
  if eval "test \"`echo '$''{'php_cv_lemon_version'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -87566,7 +88544,7 @@
+@@ -87566,7 +88886,7 @@ but you've either not enabled pdo, or have disabled it.
    
  
      echo $ac_n "checking size of char *""... $ac_c" 1>&6
 -echo "configure:87570: checking size of char *" >&5
-+echo "configure:88548: checking size of char *" >&5
++echo "configure:88890: checking size of char *" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -87574,18 +88552,19 @@
+@@ -87574,18 +88894,19 @@ else
    ac_cv_sizeof_char_p=4
  else
    cat > conftest.$ac_ext <<EOF
 -#line 87578 "configure"
-+#line 88556 "configure"
++#line 88898 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -13921,2647 +14273,2647 @@
  }
  EOF
 -if { (eval echo configure:87589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:88568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:88910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_char_p=`cat conftestval`
  else
-@@ -87647,12 +88626,12 @@
+@@ -87647,12 +88968,12 @@ EOF
    for ac_func in usleep nanosleep
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:87651: checking for $ac_func" >&5
-+echo "configure:88630: checking for $ac_func" >&5
++echo "configure:88972: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 87656 "configure"
-+#line 88635 "configure"
++#line 88977 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -87675,7 +88654,7 @@
+@@ -87675,7 +88996,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:87679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:88658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:89000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -87703,17 +88682,17 @@
+@@ -87703,17 +89024,17 @@ done
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:87707: checking for $ac_hdr" >&5
-+echo "configure:88686: checking for $ac_hdr" >&5
++echo "configure:89028: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 87712 "configure"
-+#line 88691 "configure"
++#line 89033 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:87717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:88696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:89038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -87744,7 +88723,7 @@
+@@ -87744,7 +89065,7 @@ fi
  
  
  echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6
 -echo "configure:87748: checking whether flush should be called explicitly after a buffered io" >&5
-+echo "configure:88727: checking whether flush should be called explicitly after a buffered io" >&5
++echo "configure:89069: checking whether flush should be called explicitly after a buffered io" >&5
  if eval "test \"`echo '$''{'ac_cv_flush_io'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -87755,7 +88734,7 @@
+@@ -87755,7 +89076,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 87759 "configure"
-+#line 88738 "configure"
++#line 89080 "configure"
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -87793,7 +88772,7 @@
+@@ -87793,7 +89114,7 @@ int main(int argc, char **argv)
  }
  
  EOF
 -if { (eval echo configure:87797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:88776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:89118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    ac_cv_flush_io=no
-@@ -87821,7 +88800,7 @@
+@@ -87821,7 +89142,7 @@ fi
  
  if test "$ac_cv_func_crypt" = "no"; then
    echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
 -echo "configure:87825: checking for crypt in -lcrypt" >&5
-+echo "configure:88804: checking for crypt in -lcrypt" >&5
++echo "configure:89146: checking for crypt in -lcrypt" >&5
  ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -87829,7 +88808,7 @@
+@@ -87829,7 +89150,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lcrypt  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 87833 "configure"
-+#line 88812 "configure"
++#line 89154 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -87840,7 +88819,7 @@
+@@ -87840,7 +89161,7 @@ int main() {
  crypt()
  ; return 0; }
  EOF
 -if { (eval echo configure:87844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:88823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:89165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -87869,7 +88848,7 @@
+@@ -87869,7 +89190,7 @@ fi
  fi
    
  echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6
 -echo "configure:87873: checking for standard DES crypt" >&5
-+echo "configure:88852: checking for standard DES crypt" >&5
++echo "configure:89194: checking for standard DES crypt" >&5
  if eval "test \"`echo '$''{'ac_cv_crypt_des'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -87880,7 +88859,7 @@
+@@ -87880,7 +89201,7 @@ else
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 87884 "configure"
-+#line 88863 "configure"
++#line 89205 "configure"
  #include "confdefs.h"
  
  #if HAVE_UNISTD_H
-@@ -87899,7 +88878,7 @@
+@@ -87899,7 +89220,7 @@ main() {
  #endif
  }
  EOF
 -if { (eval echo configure:87903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:88882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:89224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    ac_cv_crypt_des=yes
-@@ -87920,7 +88899,7 @@
+@@ -87920,7 +89241,7 @@ fi
  echo "$ac_t""$ac_cv_crypt_des" 1>&6
  
  echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6
 -echo "configure:87924: checking for extended DES crypt" >&5
-+echo "configure:88903: checking for extended DES crypt" >&5
++echo "configure:89245: checking for extended DES crypt" >&5
  if eval "test \"`echo '$''{'ac_cv_crypt_ext_des'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -87931,7 +88910,7 @@
+@@ -87931,7 +89252,7 @@ else
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 87935 "configure"
-+#line 88914 "configure"
++#line 89256 "configure"
  #include "confdefs.h"
  
  #if HAVE_UNISTD_H
-@@ -87950,7 +88929,7 @@
+@@ -87950,7 +89271,7 @@ main() {
  #endif
  }
  EOF
 -if { (eval echo configure:87954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:88933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:89275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    ac_cv_crypt_ext_des=yes
-@@ -87971,7 +88950,7 @@
+@@ -87971,7 +89292,7 @@ fi
  echo "$ac_t""$ac_cv_crypt_ext_des" 1>&6
  
  echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6
 -echo "configure:87975: checking for MD5 crypt" >&5
-+echo "configure:88954: checking for MD5 crypt" >&5
++echo "configure:89296: checking for MD5 crypt" >&5
  if eval "test \"`echo '$''{'ac_cv_crypt_md5'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -87982,7 +88961,7 @@
+@@ -87982,7 +89303,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 87986 "configure"
-+#line 88965 "configure"
++#line 89307 "configure"
  #include "confdefs.h"
  
  #if HAVE_UNISTD_H
-@@ -88010,7 +88989,7 @@
+@@ -88010,7 +89331,7 @@ main() {
  #endif
  }
  EOF
 -if { (eval echo configure:88014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:88993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:89335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    ac_cv_crypt_md5=yes
-@@ -88031,7 +89010,7 @@
+@@ -88031,7 +89352,7 @@ fi
  echo "$ac_t""$ac_cv_crypt_md5" 1>&6
  
  echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6
 -echo "configure:88035: checking for Blowfish crypt" >&5
-+echo "configure:89014: checking for Blowfish crypt" >&5
++echo "configure:89356: checking for Blowfish crypt" >&5
  if eval "test \"`echo '$''{'ac_cv_crypt_blowfish'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -88042,7 +89021,7 @@
+@@ -88042,7 +89363,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 88046 "configure"
-+#line 89025 "configure"
++#line 89367 "configure"
  #include "confdefs.h"
  
  #if HAVE_UNISTD_H
-@@ -88067,7 +89046,7 @@
+@@ -88067,7 +89388,7 @@ main() {
  #endif
  }
  EOF
 -if { (eval echo configure:88071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:89050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:89392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    ac_cv_crypt_blowfish=yes
-@@ -88088,7 +89067,7 @@
+@@ -88088,7 +89409,7 @@ fi
  echo "$ac_t""$ac_cv_crypt_blowfish" 1>&6
  
  echo $ac_n "checking for SHA512 crypt""... $ac_c" 1>&6
 -echo "configure:88092: checking for SHA512 crypt" >&5
-+echo "configure:89071: checking for SHA512 crypt" >&5
++echo "configure:89413: checking for SHA512 crypt" >&5
  if eval "test \"`echo '$''{'ac_cv_crypt_SHA512'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -88099,7 +89078,7 @@
+@@ -88099,7 +89420,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 88103 "configure"
-+#line 89082 "configure"
++#line 89424 "configure"
  #include "confdefs.h"
  
  #if HAVE_UNISTD_H
-@@ -88123,7 +89102,7 @@
+@@ -88123,7 +89444,7 @@ main() {
  #endif
  }
  EOF
 -if { (eval echo configure:88127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:89106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:89448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    ac_cv_crypt_SHA512=yes
-@@ -88144,7 +89123,7 @@
+@@ -88144,7 +89465,7 @@ fi
  echo "$ac_t""$ac_cv_crypt_SHA512" 1>&6
  
  echo $ac_n "checking for SHA256 crypt""... $ac_c" 1>&6
 -echo "configure:88148: checking for SHA256 crypt" >&5
-+echo "configure:89127: checking for SHA256 crypt" >&5
++echo "configure:89469: checking for SHA256 crypt" >&5
  if eval "test \"`echo '$''{'ac_cv_crypt_SHA256'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -88155,7 +89134,7 @@
+@@ -88155,7 +89476,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 88159 "configure"
-+#line 89138 "configure"
++#line 89480 "configure"
  #include "confdefs.h"
  
  #if HAVE_UNISTD_H
-@@ -88179,7 +89158,7 @@
+@@ -88179,7 +89500,7 @@ main() {
  #endif
  }
  EOF
 -if { (eval echo configure:88183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:89162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:89504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    ac_cv_crypt_SHA256=yes
-@@ -88203,13 +89182,13 @@
+@@ -88203,13 +89524,13 @@ echo "$ac_t""$ac_cv_crypt_SHA256" 1>&6
  if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then
  
          echo $ac_n "checking whether the compiler supports __alignof__""... $ac_c" 1>&6
 -echo "configure:88207: checking whether the compiler supports __alignof__" >&5
-+echo "configure:89186: checking whether the compiler supports __alignof__" >&5
++echo "configure:89528: checking whether the compiler supports __alignof__" >&5
  if eval "test \"`echo '$''{'ac_cv_alignof_exists'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
    cat > conftest.$ac_ext <<EOF
 -#line 88213 "configure"
-+#line 89192 "configure"
++#line 89534 "configure"
  #include "confdefs.h"
  
    
-@@ -88219,7 +89198,7 @@
+@@ -88219,7 +89540,7 @@ int main() {
    
  ; return 0; }
  EOF
 -if { (eval echo configure:88223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:89202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:89544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      ac_cv_alignof_exists=yes
-@@ -88244,13 +89223,13 @@
+@@ -88244,13 +89565,13 @@ EOF
    fi
  
          echo $ac_n "checking whether the compiler supports aligned attribute""... $ac_c" 1>&6
 -echo "configure:88248: checking whether the compiler supports aligned attribute" >&5
-+echo "configure:89227: checking whether the compiler supports aligned attribute" >&5
++echo "configure:89569: checking whether the compiler supports aligned attribute" >&5
  if eval "test \"`echo '$''{'ac_cv_attribute_aligned'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
    cat > conftest.$ac_ext <<EOF
 -#line 88254 "configure"
-+#line 89233 "configure"
++#line 89575 "configure"
  #include "confdefs.h"
  
    
-@@ -88260,7 +89239,7 @@
+@@ -88260,7 +89581,7 @@ int main() {
    
  ; return 0; }
  EOF
 -if { (eval echo configure:88264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:89243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:89585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      ac_cv_attribute_aligned=yes
-@@ -88439,12 +89418,12 @@
+@@ -88439,12 +89760,12 @@ fi
  for ac_func in getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:88443: checking for $ac_func" >&5
-+echo "configure:89422: checking for $ac_func" >&5
++echo "configure:89764: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 88448 "configure"
-+#line 89427 "configure"
++#line 89769 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -88467,7 +89446,7 @@
+@@ -88467,7 +89788,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:88471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:89450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:89792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -88492,7 +89471,7 @@
+@@ -88492,7 +89813,7 @@ fi
  done
  
  echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6
 -echo "configure:88496: checking for working fnmatch" >&5
-+echo "configure:89475: checking for working fnmatch" >&5
++echo "configure:89817: checking for working fnmatch" >&5
  if eval "test \"`echo '$''{'ac_cv_func_fnmatch_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -88503,11 +89482,11 @@
+@@ -88503,11 +89824,11 @@ if test "$cross_compiling" = yes; then
    ac_cv_func_fnmatch_works=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 88507 "configure"
-+#line 89486 "configure"
++#line 89828 "configure"
  #include "confdefs.h"
  main() { exit (fnmatch ("a*", "abc", 0) != 0); }
  EOF
 -if { (eval echo configure:88511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:89490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:89832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_fnmatch_works=yes
  else
-@@ -88534,12 +89513,12 @@
+@@ -88534,12 +89855,12 @@ fi
  for ac_func in fork CreateProcess
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:88538: checking for $ac_func" >&5
-+echo "configure:89517: checking for $ac_func" >&5
++echo "configure:89859: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 88543 "configure"
-+#line 89522 "configure"
++#line 89864 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -88562,7 +89541,7 @@
+@@ -88562,7 +89883,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:88566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:89545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:89887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -88592,7 +89571,7 @@
+@@ -88592,7 +89913,7 @@ fi
  done
  
  echo $ac_n "checking if your OS can spawn processes with inherited handles""... $ac_c" 1>&6
 -echo "configure:88596: checking if your OS can spawn processes with inherited handles" >&5
-+echo "configure:89575: checking if your OS can spawn processes with inherited handles" >&5
++echo "configure:89917: checking if your OS can spawn processes with inherited handles" >&5
  if test "$php_can_support_proc_open" = "yes"; then
    echo "$ac_t""yes" 1>&6
    cat >> confdefs.h <<\EOF
-@@ -88616,12 +89595,12 @@
+@@ -88616,12 +89937,12 @@ fi
    unset found
    
    echo $ac_n "checking for res_nsearch""... $ac_c" 1>&6
 -echo "configure:88620: checking for res_nsearch" >&5
-+echo "configure:89599: checking for res_nsearch" >&5
++echo "configure:89941: checking for res_nsearch" >&5
  if eval "test \"`echo '$''{'ac_cv_func_res_nsearch'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 88625 "configure"
-+#line 89604 "configure"
++#line 89946 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char res_nsearch(); below.  */
-@@ -88644,7 +89623,7 @@
+@@ -88644,7 +89965,7 @@ res_nsearch();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:88648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:89627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:89969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_res_nsearch=yes"
  else
-@@ -88662,12 +89641,12 @@
+@@ -88662,12 +89983,12 @@ if eval "test \"`echo '$ac_cv_func_'res_nsearch`\" = yes"; then
  else
    echo "$ac_t""no" 1>&6
   echo $ac_n "checking for __res_nsearch""... $ac_c" 1>&6
 -echo "configure:88666: checking for __res_nsearch" >&5
-+echo "configure:89645: checking for __res_nsearch" >&5
++echo "configure:89987: checking for __res_nsearch" >&5
  if eval "test \"`echo '$''{'ac_cv_func___res_nsearch'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 88671 "configure"
-+#line 89650 "configure"
++#line 89992 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __res_nsearch(); below.  */
-@@ -88690,7 +89669,7 @@
+@@ -88690,7 +90011,7 @@ __res_nsearch();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:88694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:89673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:90015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func___res_nsearch=yes"
  else
-@@ -88728,7 +89707,7 @@
+@@ -88728,7 +90049,7 @@ EOF
    unset ac_cv_lib_resolv___res_nsearch
    unset found
    echo $ac_n "checking for res_nsearch in -lresolv""... $ac_c" 1>&6
 -echo "configure:88732: checking for res_nsearch in -lresolv" >&5
-+echo "configure:89711: checking for res_nsearch in -lresolv" >&5
++echo "configure:90053: checking for res_nsearch in -lresolv" >&5
  ac_lib_var=`echo resolv'_'res_nsearch | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -88736,7 +89715,7 @@
+@@ -88736,7 +90057,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 88740 "configure"
-+#line 89719 "configure"
++#line 90061 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -88747,7 +89726,7 @@
+@@ -88747,7 +90068,7 @@ int main() {
  res_nsearch()
  ; return 0; }
  EOF
 -if { (eval echo configure:88751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:89730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:90072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -88767,7 +89746,7 @@
+@@ -88767,7 +90088,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __res_nsearch in -lresolv""... $ac_c" 1>&6
 -echo "configure:88771: checking for __res_nsearch in -lresolv" >&5
-+echo "configure:89750: checking for __res_nsearch in -lresolv" >&5
++echo "configure:90092: checking for __res_nsearch in -lresolv" >&5
  ac_lib_var=`echo resolv'_'__res_nsearch | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -88775,7 +89754,7 @@
+@@ -88775,7 +90096,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 88779 "configure"
-+#line 89758 "configure"
++#line 90100 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -88786,7 +89765,7 @@
+@@ -88786,7 +90107,7 @@ int main() {
  __res_nsearch()
  ; return 0; }
  EOF
 -if { (eval echo configure:88790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:89769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:90111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -88818,11 +89797,11 @@
+@@ -88818,11 +90139,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 88822 "configure"
-+#line 89801 "configure"
++#line 90143 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:88826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:89805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:90147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -88864,7 +89843,7 @@
+@@ -88864,7 +90185,7 @@ EOF
    unset ac_cv_lib_bind___res_nsearch
    unset found
    echo $ac_n "checking for res_nsearch in -lbind""... $ac_c" 1>&6
 -echo "configure:88868: checking for res_nsearch in -lbind" >&5
-+echo "configure:89847: checking for res_nsearch in -lbind" >&5
++echo "configure:90189: checking for res_nsearch in -lbind" >&5
  ac_lib_var=`echo bind'_'res_nsearch | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -88872,7 +89851,7 @@
+@@ -88872,7 +90193,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 88876 "configure"
-+#line 89855 "configure"
++#line 90197 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -88883,7 +89862,7 @@
+@@ -88883,7 +90204,7 @@ int main() {
  res_nsearch()
  ; return 0; }
  EOF
 -if { (eval echo configure:88887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:89866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:90208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -88903,7 +89882,7 @@
+@@ -88903,7 +90224,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __res_nsearch in -lbind""... $ac_c" 1>&6
 -echo "configure:88907: checking for __res_nsearch in -lbind" >&5
-+echo "configure:89886: checking for __res_nsearch in -lbind" >&5
++echo "configure:90228: checking for __res_nsearch in -lbind" >&5
  ac_lib_var=`echo bind'_'__res_nsearch | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -88911,7 +89890,7 @@
+@@ -88911,7 +90232,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 88915 "configure"
-+#line 89894 "configure"
++#line 90236 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -88922,7 +89901,7 @@
+@@ -88922,7 +90243,7 @@ int main() {
  __res_nsearch()
  ; return 0; }
  EOF
 -if { (eval echo configure:88926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:89905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:90247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -88954,11 +89933,11 @@
+@@ -88954,11 +90275,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 88958 "configure"
-+#line 89937 "configure"
++#line 90279 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:88962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:89941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:90283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -89000,7 +89979,7 @@
+@@ -89000,7 +90321,7 @@ EOF
    unset ac_cv_lib_socket___res_nsearch
    unset found
    echo $ac_n "checking for res_nsearch in -lsocket""... $ac_c" 1>&6
 -echo "configure:89004: checking for res_nsearch in -lsocket" >&5
-+echo "configure:89983: checking for res_nsearch in -lsocket" >&5
++echo "configure:90325: checking for res_nsearch in -lsocket" >&5
  ac_lib_var=`echo socket'_'res_nsearch | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -89008,7 +89987,7 @@
+@@ -89008,7 +90329,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89012 "configure"
-+#line 89991 "configure"
++#line 90333 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -89019,7 +89998,7 @@
+@@ -89019,7 +90340,7 @@ int main() {
  res_nsearch()
  ; return 0; }
  EOF
 -if { (eval echo configure:89023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:90002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:90344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -89039,7 +90018,7 @@
+@@ -89039,7 +90360,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __res_nsearch in -lsocket""... $ac_c" 1>&6
 -echo "configure:89043: checking for __res_nsearch in -lsocket" >&5
-+echo "configure:90022: checking for __res_nsearch in -lsocket" >&5
++echo "configure:90364: checking for __res_nsearch in -lsocket" >&5
  ac_lib_var=`echo socket'_'__res_nsearch | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -89047,7 +90026,7 @@
+@@ -89047,7 +90368,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89051 "configure"
-+#line 90030 "configure"
++#line 90372 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -89058,7 +90037,7 @@
+@@ -89058,7 +90379,7 @@ int main() {
  __res_nsearch()
  ; return 0; }
  EOF
 -if { (eval echo configure:89062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:90041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:90383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -89090,11 +90069,11 @@
+@@ -89090,11 +90411,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 89094 "configure"
-+#line 90073 "configure"
++#line 90415 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:89098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:90077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:90419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -89151,12 +90130,12 @@
+@@ -89151,12 +90472,12 @@ EOF
    unset found
    
    echo $ac_n "checking for dns_search""... $ac_c" 1>&6
 -echo "configure:89155: checking for dns_search" >&5
-+echo "configure:90134: checking for dns_search" >&5
++echo "configure:90476: checking for dns_search" >&5
  if eval "test \"`echo '$''{'ac_cv_func_dns_search'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 89160 "configure"
-+#line 90139 "configure"
++#line 90481 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char dns_search(); below.  */
-@@ -89179,7 +90158,7 @@
+@@ -89179,7 +90500,7 @@ dns_search();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:89183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:90162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:90504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_dns_search=yes"
  else
-@@ -89197,12 +90176,12 @@
+@@ -89197,12 +90518,12 @@ if eval "test \"`echo '$ac_cv_func_'dns_search`\" = yes"; then
  else
    echo "$ac_t""no" 1>&6
   echo $ac_n "checking for __dns_search""... $ac_c" 1>&6
 -echo "configure:89201: checking for __dns_search" >&5
-+echo "configure:90180: checking for __dns_search" >&5
++echo "configure:90522: checking for __dns_search" >&5
  if eval "test \"`echo '$''{'ac_cv_func___dns_search'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 89206 "configure"
-+#line 90185 "configure"
++#line 90527 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __dns_search(); below.  */
-@@ -89225,7 +90204,7 @@
+@@ -89225,7 +90546,7 @@ __dns_search();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:89229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:90208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:90550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func___dns_search=yes"
  else
-@@ -89263,7 +90242,7 @@
+@@ -89263,7 +90584,7 @@ EOF
    unset ac_cv_lib_resolv___dns_search
    unset found
    echo $ac_n "checking for dns_search in -lresolv""... $ac_c" 1>&6
 -echo "configure:89267: checking for dns_search in -lresolv" >&5
-+echo "configure:90246: checking for dns_search in -lresolv" >&5
++echo "configure:90588: checking for dns_search in -lresolv" >&5
  ac_lib_var=`echo resolv'_'dns_search | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -89271,7 +90250,7 @@
+@@ -89271,7 +90592,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89275 "configure"
-+#line 90254 "configure"
++#line 90596 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -89282,7 +90261,7 @@
+@@ -89282,7 +90603,7 @@ int main() {
  dns_search()
  ; return 0; }
  EOF
 -if { (eval echo configure:89286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:90265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:90607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -89302,7 +90281,7 @@
+@@ -89302,7 +90623,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __dns_search in -lresolv""... $ac_c" 1>&6
 -echo "configure:89306: checking for __dns_search in -lresolv" >&5
-+echo "configure:90285: checking for __dns_search in -lresolv" >&5
++echo "configure:90627: checking for __dns_search in -lresolv" >&5
  ac_lib_var=`echo resolv'_'__dns_search | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -89310,7 +90289,7 @@
+@@ -89310,7 +90631,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89314 "configure"
-+#line 90293 "configure"
++#line 90635 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -89321,7 +90300,7 @@
+@@ -89321,7 +90642,7 @@ int main() {
  __dns_search()
  ; return 0; }
  EOF
 -if { (eval echo configure:89325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:90304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:90646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -89353,11 +90332,11 @@
+@@ -89353,11 +90674,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 89357 "configure"
-+#line 90336 "configure"
++#line 90678 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:89361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:90340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:90682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -89399,7 +90378,7 @@
+@@ -89399,7 +90720,7 @@ EOF
    unset ac_cv_lib_bind___dns_search
    unset found
    echo $ac_n "checking for dns_search in -lbind""... $ac_c" 1>&6
 -echo "configure:89403: checking for dns_search in -lbind" >&5
-+echo "configure:90382: checking for dns_search in -lbind" >&5
++echo "configure:90724: checking for dns_search in -lbind" >&5
  ac_lib_var=`echo bind'_'dns_search | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -89407,7 +90386,7 @@
+@@ -89407,7 +90728,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89411 "configure"
-+#line 90390 "configure"
++#line 90732 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -89418,7 +90397,7 @@
+@@ -89418,7 +90739,7 @@ int main() {
  dns_search()
  ; return 0; }
  EOF
 -if { (eval echo configure:89422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:90401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:90743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -89438,7 +90417,7 @@
+@@ -89438,7 +90759,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __dns_search in -lbind""... $ac_c" 1>&6
 -echo "configure:89442: checking for __dns_search in -lbind" >&5
-+echo "configure:90421: checking for __dns_search in -lbind" >&5
++echo "configure:90763: checking for __dns_search in -lbind" >&5
  ac_lib_var=`echo bind'_'__dns_search | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -89446,7 +90425,7 @@
+@@ -89446,7 +90767,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89450 "configure"
-+#line 90429 "configure"
++#line 90771 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -89457,7 +90436,7 @@
+@@ -89457,7 +90778,7 @@ int main() {
  __dns_search()
  ; return 0; }
  EOF
 -if { (eval echo configure:89461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:90440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:90782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -89489,11 +90468,11 @@
+@@ -89489,11 +90810,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 89493 "configure"
-+#line 90472 "configure"
++#line 90814 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:89497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:90476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:90818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -89535,7 +90514,7 @@
+@@ -89535,7 +90856,7 @@ EOF
    unset ac_cv_lib_socket___dns_search
    unset found
    echo $ac_n "checking for dns_search in -lsocket""... $ac_c" 1>&6
 -echo "configure:89539: checking for dns_search in -lsocket" >&5
-+echo "configure:90518: checking for dns_search in -lsocket" >&5
++echo "configure:90860: checking for dns_search in -lsocket" >&5
  ac_lib_var=`echo socket'_'dns_search | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -89543,7 +90522,7 @@
+@@ -89543,7 +90864,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89547 "configure"
-+#line 90526 "configure"
++#line 90868 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -89554,7 +90533,7 @@
+@@ -89554,7 +90875,7 @@ int main() {
  dns_search()
  ; return 0; }
  EOF
 -if { (eval echo configure:89558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:90537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:90879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -89574,7 +90553,7 @@
+@@ -89574,7 +90895,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __dns_search in -lsocket""... $ac_c" 1>&6
 -echo "configure:89578: checking for __dns_search in -lsocket" >&5
-+echo "configure:90557: checking for __dns_search in -lsocket" >&5
++echo "configure:90899: checking for __dns_search in -lsocket" >&5
  ac_lib_var=`echo socket'_'__dns_search | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -89582,7 +90561,7 @@
+@@ -89582,7 +90903,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89586 "configure"
-+#line 90565 "configure"
++#line 90907 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -89593,7 +90572,7 @@
+@@ -89593,7 +90914,7 @@ int main() {
  __dns_search()
  ; return 0; }
  EOF
 -if { (eval echo configure:89597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:90576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:90918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -89625,11 +90604,11 @@
+@@ -89625,11 +90946,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 89629 "configure"
-+#line 90608 "configure"
++#line 90950 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:89633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:90612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:90954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -89686,12 +90665,12 @@
+@@ -89686,12 +91007,12 @@ EOF
    unset found
    
    echo $ac_n "checking for dn_expand""... $ac_c" 1>&6
 -echo "configure:89690: checking for dn_expand" >&5
-+echo "configure:90669: checking for dn_expand" >&5
++echo "configure:91011: checking for dn_expand" >&5
  if eval "test \"`echo '$''{'ac_cv_func_dn_expand'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 89695 "configure"
-+#line 90674 "configure"
++#line 91016 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char dn_expand(); below.  */
-@@ -89714,7 +90693,7 @@
+@@ -89714,7 +91035,7 @@ dn_expand();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:89718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:90697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_dn_expand=yes"
  else
-@@ -89732,12 +90711,12 @@
+@@ -89732,12 +91053,12 @@ if eval "test \"`echo '$ac_cv_func_'dn_expand`\" = yes"; then
  else
    echo "$ac_t""no" 1>&6
   echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6
 -echo "configure:89736: checking for __dn_expand" >&5
-+echo "configure:90715: checking for __dn_expand" >&5
++echo "configure:91057: checking for __dn_expand" >&5
  if eval "test \"`echo '$''{'ac_cv_func___dn_expand'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 89741 "configure"
-+#line 90720 "configure"
++#line 91062 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __dn_expand(); below.  */
-@@ -89760,7 +90739,7 @@
+@@ -89760,7 +91081,7 @@ __dn_expand();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:89764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:90743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func___dn_expand=yes"
  else
-@@ -89798,7 +90777,7 @@
+@@ -89798,7 +91119,7 @@ EOF
    unset ac_cv_lib_resolv___dn_expand
    unset found
    echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6
 -echo "configure:89802: checking for dn_expand in -lresolv" >&5
-+echo "configure:90781: checking for dn_expand in -lresolv" >&5
++echo "configure:91123: checking for dn_expand in -lresolv" >&5
  ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -89806,7 +90785,7 @@
+@@ -89806,7 +91127,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89810 "configure"
-+#line 90789 "configure"
++#line 91131 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -89817,7 +90796,7 @@
+@@ -89817,7 +91138,7 @@ int main() {
  dn_expand()
  ; return 0; }
  EOF
 -if { (eval echo configure:89821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:90800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -89837,7 +90816,7 @@
+@@ -89837,7 +91158,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6
 -echo "configure:89841: checking for __dn_expand in -lresolv" >&5
-+echo "configure:90820: checking for __dn_expand in -lresolv" >&5
++echo "configure:91162: checking for __dn_expand in -lresolv" >&5
  ac_lib_var=`echo resolv'_'__dn_expand | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -89845,7 +90824,7 @@
+@@ -89845,7 +91166,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89849 "configure"
-+#line 90828 "configure"
++#line 91170 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -89856,7 +90835,7 @@
+@@ -89856,7 +91177,7 @@ int main() {
  __dn_expand()
  ; return 0; }
  EOF
 -if { (eval echo configure:89860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:90839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -89888,11 +90867,11 @@
+@@ -89888,11 +91209,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 89892 "configure"
-+#line 90871 "configure"
++#line 91213 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:89896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:90875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:91217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -89934,7 +90913,7 @@
+@@ -89934,7 +91255,7 @@ EOF
    unset ac_cv_lib_bind___dn_expand
    unset found
    echo $ac_n "checking for dn_expand in -lbind""... $ac_c" 1>&6
 -echo "configure:89938: checking for dn_expand in -lbind" >&5
-+echo "configure:90917: checking for dn_expand in -lbind" >&5
++echo "configure:91259: checking for dn_expand in -lbind" >&5
  ac_lib_var=`echo bind'_'dn_expand | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -89942,7 +90921,7 @@
+@@ -89942,7 +91263,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89946 "configure"
-+#line 90925 "configure"
++#line 91267 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -89953,7 +90932,7 @@
+@@ -89953,7 +91274,7 @@ int main() {
  dn_expand()
  ; return 0; }
  EOF
 -if { (eval echo configure:89957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:90936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -89973,7 +90952,7 @@
+@@ -89973,7 +91294,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __dn_expand in -lbind""... $ac_c" 1>&6
 -echo "configure:89977: checking for __dn_expand in -lbind" >&5
-+echo "configure:90956: checking for __dn_expand in -lbind" >&5
++echo "configure:91298: checking for __dn_expand in -lbind" >&5
  ac_lib_var=`echo bind'_'__dn_expand | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -89981,7 +90960,7 @@
+@@ -89981,7 +91302,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89985 "configure"
-+#line 90964 "configure"
++#line 91306 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -89992,7 +90971,7 @@
+@@ -89992,7 +91313,7 @@ int main() {
  __dn_expand()
  ; return 0; }
  EOF
 -if { (eval echo configure:89996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:90975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -90024,11 +91003,11 @@
+@@ -90024,11 +91345,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 90028 "configure"
-+#line 91007 "configure"
++#line 91349 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:90032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:91011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:91353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -90070,7 +91049,7 @@
+@@ -90070,7 +91391,7 @@ EOF
    unset ac_cv_lib_socket___dn_expand
    unset found
    echo $ac_n "checking for dn_expand in -lsocket""... $ac_c" 1>&6
 -echo "configure:90074: checking for dn_expand in -lsocket" >&5
-+echo "configure:91053: checking for dn_expand in -lsocket" >&5
++echo "configure:91395: checking for dn_expand in -lsocket" >&5
  ac_lib_var=`echo socket'_'dn_expand | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -90078,7 +91057,7 @@
+@@ -90078,7 +91399,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 90082 "configure"
-+#line 91061 "configure"
++#line 91403 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -90089,7 +91068,7 @@
+@@ -90089,7 +91410,7 @@ int main() {
  dn_expand()
  ; return 0; }
  EOF
 -if { (eval echo configure:90093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:91072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -90109,7 +91088,7 @@
+@@ -90109,7 +91430,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __dn_expand in -lsocket""... $ac_c" 1>&6
 -echo "configure:90113: checking for __dn_expand in -lsocket" >&5
-+echo "configure:91092: checking for __dn_expand in -lsocket" >&5
++echo "configure:91434: checking for __dn_expand in -lsocket" >&5
  ac_lib_var=`echo socket'_'__dn_expand | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -90117,7 +91096,7 @@
+@@ -90117,7 +91438,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 90121 "configure"
-+#line 91100 "configure"
++#line 91442 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -90128,7 +91107,7 @@
+@@ -90128,7 +91449,7 @@ int main() {
  __dn_expand()
  ; return 0; }
  EOF
 -if { (eval echo configure:90132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:91111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -90160,11 +91139,11 @@
+@@ -90160,11 +91481,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 90164 "configure"
-+#line 91143 "configure"
++#line 91485 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:90168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:91147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:91489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -90221,12 +91200,12 @@
+@@ -90221,12 +91542,12 @@ EOF
    unset found
    
    echo $ac_n "checking for dn_skipname""... $ac_c" 1>&6
 -echo "configure:90225: checking for dn_skipname" >&5
-+echo "configure:91204: checking for dn_skipname" >&5
++echo "configure:91546: checking for dn_skipname" >&5
  if eval "test \"`echo '$''{'ac_cv_func_dn_skipname'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 90230 "configure"
-+#line 91209 "configure"
++#line 91551 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char dn_skipname(); below.  */
-@@ -90249,7 +91228,7 @@
+@@ -90249,7 +91570,7 @@ dn_skipname();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:90253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:91232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_dn_skipname=yes"
  else
-@@ -90267,12 +91246,12 @@
+@@ -90267,12 +91588,12 @@ if eval "test \"`echo '$ac_cv_func_'dn_skipname`\" = yes"; then
  else
    echo "$ac_t""no" 1>&6
   echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6
 -echo "configure:90271: checking for __dn_skipname" >&5
-+echo "configure:91250: checking for __dn_skipname" >&5
++echo "configure:91592: checking for __dn_skipname" >&5
  if eval "test \"`echo '$''{'ac_cv_func___dn_skipname'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 90276 "configure"
-+#line 91255 "configure"
++#line 91597 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __dn_skipname(); below.  */
-@@ -90295,7 +91274,7 @@
+@@ -90295,7 +91616,7 @@ __dn_skipname();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:90299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:91278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func___dn_skipname=yes"
  else
-@@ -90333,7 +91312,7 @@
+@@ -90333,7 +91654,7 @@ EOF
    unset ac_cv_lib_resolv___dn_skipname
    unset found
    echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6
 -echo "configure:90337: checking for dn_skipname in -lresolv" >&5
-+echo "configure:91316: checking for dn_skipname in -lresolv" >&5
++echo "configure:91658: checking for dn_skipname in -lresolv" >&5
  ac_lib_var=`echo resolv'_'dn_skipname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -90341,7 +91320,7 @@
+@@ -90341,7 +91662,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 90345 "configure"
-+#line 91324 "configure"
++#line 91666 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -90352,7 +91331,7 @@
+@@ -90352,7 +91673,7 @@ int main() {
  dn_skipname()
  ; return 0; }
  EOF
 -if { (eval echo configure:90356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:91335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -90372,7 +91351,7 @@
+@@ -90372,7 +91693,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6
 -echo "configure:90376: checking for __dn_skipname in -lresolv" >&5
-+echo "configure:91355: checking for __dn_skipname in -lresolv" >&5
++echo "configure:91697: checking for __dn_skipname in -lresolv" >&5
  ac_lib_var=`echo resolv'_'__dn_skipname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -90380,7 +91359,7 @@
+@@ -90380,7 +91701,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 90384 "configure"
-+#line 91363 "configure"
++#line 91705 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -90391,7 +91370,7 @@
+@@ -90391,7 +91712,7 @@ int main() {
  __dn_skipname()
  ; return 0; }
  EOF
 -if { (eval echo configure:90395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:91374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -90423,11 +91402,11 @@
+@@ -90423,11 +91744,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 90427 "configure"
-+#line 91406 "configure"
++#line 91748 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:90431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:91410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:91752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -90469,7 +91448,7 @@
+@@ -90469,7 +91790,7 @@ EOF
    unset ac_cv_lib_bind___dn_skipname
    unset found
    echo $ac_n "checking for dn_skipname in -lbind""... $ac_c" 1>&6
 -echo "configure:90473: checking for dn_skipname in -lbind" >&5
-+echo "configure:91452: checking for dn_skipname in -lbind" >&5
++echo "configure:91794: checking for dn_skipname in -lbind" >&5
  ac_lib_var=`echo bind'_'dn_skipname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -90477,7 +91456,7 @@
+@@ -90477,7 +91798,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 90481 "configure"
-+#line 91460 "configure"
++#line 91802 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -90488,7 +91467,7 @@
+@@ -90488,7 +91809,7 @@ int main() {
  dn_skipname()
  ; return 0; }
  EOF
 -if { (eval echo configure:90492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:91471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -90508,7 +91487,7 @@
+@@ -90508,7 +91829,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6
 -echo "configure:90512: checking for __dn_skipname in -lbind" >&5
-+echo "configure:91491: checking for __dn_skipname in -lbind" >&5
++echo "configure:91833: checking for __dn_skipname in -lbind" >&5
  ac_lib_var=`echo bind'_'__dn_skipname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -90516,7 +91495,7 @@
+@@ -90516,7 +91837,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 90520 "configure"
-+#line 91499 "configure"
++#line 91841 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -90527,7 +91506,7 @@
+@@ -90527,7 +91848,7 @@ int main() {
  __dn_skipname()
  ; return 0; }
  EOF
 -if { (eval echo configure:90531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:91510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -90559,11 +91538,11 @@
+@@ -90559,11 +91880,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 90563 "configure"
-+#line 91542 "configure"
++#line 91884 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:90567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:91546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:91888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -90605,7 +91584,7 @@
+@@ -90605,7 +91926,7 @@ EOF
    unset ac_cv_lib_socket___dn_skipname
    unset found
    echo $ac_n "checking for dn_skipname in -lsocket""... $ac_c" 1>&6
 -echo "configure:90609: checking for dn_skipname in -lsocket" >&5
-+echo "configure:91588: checking for dn_skipname in -lsocket" >&5
++echo "configure:91930: checking for dn_skipname in -lsocket" >&5
  ac_lib_var=`echo socket'_'dn_skipname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -90613,7 +91592,7 @@
+@@ -90613,7 +91934,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 90617 "configure"
-+#line 91596 "configure"
++#line 91938 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -90624,7 +91603,7 @@
+@@ -90624,7 +91945,7 @@ int main() {
  dn_skipname()
  ; return 0; }
  EOF
 -if { (eval echo configure:90628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:91607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -90644,7 +91623,7 @@
+@@ -90644,7 +91965,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __dn_skipname in -lsocket""... $ac_c" 1>&6
 -echo "configure:90648: checking for __dn_skipname in -lsocket" >&5
-+echo "configure:91627: checking for __dn_skipname in -lsocket" >&5
++echo "configure:91969: checking for __dn_skipname in -lsocket" >&5
  ac_lib_var=`echo socket'_'__dn_skipname | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -90652,7 +91631,7 @@
+@@ -90652,7 +91973,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 90656 "configure"
-+#line 91635 "configure"
++#line 91977 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -90663,7 +91642,7 @@
+@@ -90663,7 +91984,7 @@ int main() {
  __dn_skipname()
  ; return 0; }
  EOF
 -if { (eval echo configure:90667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:91646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -90695,11 +91674,11 @@
+@@ -90695,11 +92016,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 90699 "configure"
-+#line 91678 "configure"
++#line 92020 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:90703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:91682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:92024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -90758,12 +91737,12 @@
+@@ -90758,12 +92079,12 @@ EOF
    unset found
    
    echo $ac_n "checking for res_search""... $ac_c" 1>&6
 -echo "configure:90762: checking for res_search" >&5
-+echo "configure:91741: checking for res_search" >&5
++echo "configure:92083: checking for res_search" >&5
  if eval "test \"`echo '$''{'ac_cv_func_res_search'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 90767 "configure"
-+#line 91746 "configure"
++#line 92088 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char res_search(); below.  */
-@@ -90786,7 +91765,7 @@
+@@ -90786,7 +92107,7 @@ res_search();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:90790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:91769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_res_search=yes"
  else
-@@ -90804,12 +91783,12 @@
+@@ -90804,12 +92125,12 @@ if eval "test \"`echo '$ac_cv_func_'res_search`\" = yes"; then
  else
    echo "$ac_t""no" 1>&6
   echo $ac_n "checking for __res_search""... $ac_c" 1>&6
 -echo "configure:90808: checking for __res_search" >&5
-+echo "configure:91787: checking for __res_search" >&5
++echo "configure:92129: checking for __res_search" >&5
  if eval "test \"`echo '$''{'ac_cv_func___res_search'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 90813 "configure"
-+#line 91792 "configure"
++#line 92134 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __res_search(); below.  */
-@@ -90832,7 +91811,7 @@
+@@ -90832,7 +92153,7 @@ __res_search();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:90836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:91815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func___res_search=yes"
  else
-@@ -90870,7 +91849,7 @@
+@@ -90870,7 +92191,7 @@ EOF
    unset ac_cv_lib_resolv___res_search
    unset found
    echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6
 -echo "configure:90874: checking for res_search in -lresolv" >&5
-+echo "configure:91853: checking for res_search in -lresolv" >&5
++echo "configure:92195: checking for res_search in -lresolv" >&5
  ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -90878,7 +91857,7 @@
+@@ -90878,7 +92199,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 90882 "configure"
-+#line 91861 "configure"
++#line 92203 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -90889,7 +91868,7 @@
+@@ -90889,7 +92210,7 @@ int main() {
  res_search()
  ; return 0; }
  EOF
 -if { (eval echo configure:90893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:91872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -90909,7 +91888,7 @@
+@@ -90909,7 +92230,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6
 -echo "configure:90913: checking for __res_search in -lresolv" >&5
-+echo "configure:91892: checking for __res_search in -lresolv" >&5
++echo "configure:92234: checking for __res_search in -lresolv" >&5
  ac_lib_var=`echo resolv'_'__res_search | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -90917,7 +91896,7 @@
+@@ -90917,7 +92238,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 90921 "configure"
-+#line 91900 "configure"
++#line 92242 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -90928,7 +91907,7 @@
+@@ -90928,7 +92249,7 @@ int main() {
  __res_search()
  ; return 0; }
  EOF
 -if { (eval echo configure:90932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:91911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -90960,11 +91939,11 @@
+@@ -90960,11 +92281,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 90964 "configure"
-+#line 91943 "configure"
++#line 92285 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:90968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:91947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:92289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -91006,7 +91985,7 @@
+@@ -91006,7 +92327,7 @@ EOF
    unset ac_cv_lib_bind___res_search
    unset found
    echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6
 -echo "configure:91010: checking for res_search in -lbind" >&5
-+echo "configure:91989: checking for res_search in -lbind" >&5
++echo "configure:92331: checking for res_search in -lbind" >&5
  ac_lib_var=`echo bind'_'res_search | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -91014,7 +91993,7 @@
+@@ -91014,7 +92335,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 91018 "configure"
-+#line 91997 "configure"
++#line 92339 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -91025,7 +92004,7 @@
+@@ -91025,7 +92346,7 @@ int main() {
  res_search()
  ; return 0; }
  EOF
 -if { (eval echo configure:91029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:92008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -91045,7 +92024,7 @@
+@@ -91045,7 +92366,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6
 -echo "configure:91049: checking for __res_search in -lbind" >&5
-+echo "configure:92028: checking for __res_search in -lbind" >&5
++echo "configure:92370: checking for __res_search in -lbind" >&5
  ac_lib_var=`echo bind'_'__res_search | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -91053,7 +92032,7 @@
+@@ -91053,7 +92374,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 91057 "configure"
-+#line 92036 "configure"
++#line 92378 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -91064,7 +92043,7 @@
+@@ -91064,7 +92385,7 @@ int main() {
  __res_search()
  ; return 0; }
  EOF
 -if { (eval echo configure:91068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:92047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -91096,11 +92075,11 @@
+@@ -91096,11 +92417,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 91100 "configure"
-+#line 92079 "configure"
++#line 92421 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:91104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:92083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:92425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -91142,7 +92121,7 @@
+@@ -91142,7 +92463,7 @@ EOF
    unset ac_cv_lib_socket___res_search
    unset found
    echo $ac_n "checking for res_search in -lsocket""... $ac_c" 1>&6
 -echo "configure:91146: checking for res_search in -lsocket" >&5
-+echo "configure:92125: checking for res_search in -lsocket" >&5
++echo "configure:92467: checking for res_search in -lsocket" >&5
  ac_lib_var=`echo socket'_'res_search | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -91150,7 +92129,7 @@
+@@ -91150,7 +92471,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 91154 "configure"
-+#line 92133 "configure"
++#line 92475 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -91161,7 +92140,7 @@
+@@ -91161,7 +92482,7 @@ int main() {
  res_search()
  ; return 0; }
  EOF
 -if { (eval echo configure:91165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:92144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -91181,7 +92160,7 @@
+@@ -91181,7 +92502,7 @@ else
    echo "$ac_t""no" 1>&6
  
      echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6
 -echo "configure:91185: checking for __res_search in -lsocket" >&5
-+echo "configure:92164: checking for __res_search in -lsocket" >&5
++echo "configure:92506: checking for __res_search in -lsocket" >&5
  ac_lib_var=`echo socket'_'__res_search | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -91189,7 +92168,7 @@
+@@ -91189,7 +92510,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 91193 "configure"
-+#line 92172 "configure"
++#line 92514 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -91200,7 +92179,7 @@
+@@ -91200,7 +92521,7 @@ int main() {
  __res_search()
  ; return 0; }
  EOF
 -if { (eval echo configure:91204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:92183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -91232,11 +92211,11 @@
+@@ -91232,11 +92553,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 91236 "configure"
-+#line 92215 "configure"
++#line 92557 "configure"
  #include "confdefs.h"
  main() { return (0); }
  EOF
 -if { (eval echo configure:91240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:92219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:92561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    found=yes
  else
-@@ -91289,7 +92268,7 @@
+@@ -91289,7 +92610,7 @@ EOF
  
  
  echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6
 -echo "configure:91293: checking whether atof() accepts NAN" >&5
-+echo "configure:92272: checking whether atof() accepts NAN" >&5
++echo "configure:92614: checking whether atof() accepts NAN" >&5
  if eval "test \"`echo '$''{'ac_cv_atof_accept_nan'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -91300,7 +92279,7 @@
+@@ -91300,7 +92621,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 91304 "configure"
-+#line 92283 "configure"
++#line 92625 "configure"
  #include "confdefs.h"
  
  #include <math.h>
-@@ -91320,7 +92299,7 @@
+@@ -91320,7 +92641,7 @@ int main(int argc, char** argv)
  }
  
  EOF
 -if { (eval echo configure:91324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:92303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:92645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    ac_cv_atof_accept_nan=yes
-@@ -91347,7 +92326,7 @@
+@@ -91347,7 +92668,7 @@ EOF
  fi
  
  echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6
 -echo "configure:91351: checking whether atof() accepts INF" >&5
-+echo "configure:92330: checking whether atof() accepts INF" >&5
++echo "configure:92672: checking whether atof() accepts INF" >&5
  if eval "test \"`echo '$''{'ac_cv_atof_accept_inf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -91358,7 +92337,7 @@
+@@ -91358,7 +92679,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 91362 "configure"
-+#line 92341 "configure"
++#line 92683 "configure"
  #include "confdefs.h"
  
  #include <math.h>
-@@ -91381,7 +92360,7 @@
+@@ -91381,7 +92702,7 @@ int main(int argc, char** argv)
  }
  
  EOF
 -if { (eval echo configure:91385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:92364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:92706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    ac_cv_atof_accept_inf=yes
-@@ -91408,7 +92387,7 @@
+@@ -91408,7 +92729,7 @@ EOF
  fi
  
  echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6
 -echo "configure:91412: checking whether HUGE_VAL == INF" >&5
-+echo "configure:92391: checking whether HUGE_VAL == INF" >&5
++echo "configure:92733: checking whether HUGE_VAL == INF" >&5
  if eval "test \"`echo '$''{'ac_cv_huge_val_inf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -91419,7 +92398,7 @@
+@@ -91419,7 +92740,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 91423 "configure"
-+#line 92402 "configure"
++#line 92744 "configure"
  #include "confdefs.h"
  
  #include <math.h>
-@@ -91442,7 +92421,7 @@
+@@ -91442,7 +92763,7 @@ int main(int argc, char** argv)
  }
  
  EOF
 -if { (eval echo configure:91446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:92425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:92767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    ac_cv_huge_val_inf=yes
-@@ -91469,7 +92448,7 @@
+@@ -91469,7 +92790,7 @@ EOF
  fi
  
  echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6
 -echo "configure:91473: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5
-+echo "configure:92452: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5
++echo "configure:92794: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5
  if eval "test \"`echo '$''{'ac_cv_huge_val_nan'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -91480,7 +92459,7 @@
+@@ -91480,7 +92801,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 91484 "configure"
-+#line 92463 "configure"
++#line 92805 "configure"
  #include "confdefs.h"
  
  #include <math.h>
-@@ -91505,7 +92484,7 @@
+@@ -91505,7 +92826,7 @@ int main(int argc, char** argv)
  }
  
  EOF
 -if { (eval echo configure:91509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:92488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:92830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    ac_cv_huge_val_nan=yes
-@@ -91532,13 +92511,13 @@
+@@ -91532,13 +92853,13 @@ EOF
  fi
  
  echo $ac_n "checking whether strptime() declaration fails""... $ac_c" 1>&6
 -echo "configure:91536: checking whether strptime() declaration fails" >&5
-+echo "configure:92515: checking whether strptime() declaration fails" >&5
++echo "configure:92857: checking whether strptime() declaration fails" >&5
  if eval "test \"`echo '$''{'ac_cv_strptime_decl_fails'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
  cat > conftest.$ac_ext <<EOF
 -#line 91542 "configure"
-+#line 92521 "configure"
++#line 92863 "configure"
  #include "confdefs.h"
  
  #include <time.h>
-@@ -91554,7 +92533,7 @@
+@@ -91554,7 +92875,7 @@ int strptime(const char *s, const char *format, struct tm *tm);
  
  ; return 0; }
  EOF
 -if { (eval echo configure:91558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:92537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:92879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
    ac_cv_strptime_decl_fails=no
-@@ -91582,17 +92561,17 @@
+@@ -91582,17 +92903,17 @@ for ac_hdr in wchar.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:91586: checking for $ac_hdr" >&5
-+echo "configure:92565: checking for $ac_hdr" >&5
++echo "configure:92907: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 91591 "configure"
-+#line 92570 "configure"
++#line 92912 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:91596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:92575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:92917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -91621,12 +92600,12 @@
+@@ -91621,12 +92942,12 @@ done
  for ac_func in mblen
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:91625: checking for $ac_func" >&5
-+echo "configure:92604: checking for $ac_func" >&5
++echo "configure:92946: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 91630 "configure"
-+#line 92609 "configure"
++#line 92951 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -91649,7 +92628,7 @@
+@@ -91649,7 +92970,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:91653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:92632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -91676,12 +92655,12 @@
+@@ -91676,12 +92997,12 @@ done
  for ac_func in mbrlen mbsinit
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:91680: checking for $ac_func" >&5
-+echo "configure:92659: checking for $ac_func" >&5
++echo "configure:93001: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 91685 "configure"
-+#line 92664 "configure"
++#line 93006 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -91704,7 +92683,7 @@
+@@ -91704,7 +93025,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:91708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:92687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:93029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -91729,13 +92708,13 @@
+@@ -91729,13 +93050,13 @@ fi
  done
  
  echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6
 -echo "configure:91733: checking for mbstate_t" >&5
-+echo "configure:92712: checking for mbstate_t" >&5
++echo "configure:93054: checking for mbstate_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_mbstate_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
  cat > conftest.$ac_ext <<EOF
 -#line 91739 "configure"
-+#line 92718 "configure"
++#line 93060 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_WCHAR_H
-@@ -91748,7 +92727,7 @@
+@@ -91748,7 +93069,7 @@ int __tmp__() { mbstate_t a; }
  
  ; return 0; }
  EOF
 -if { (eval echo configure:91752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:92731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:93073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
    ac_cv_type_mbstate_t=yes
-@@ -91776,17 +92755,17 @@
+@@ -91776,17 +93097,17 @@ for ac_hdr in atomic.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:91780: checking for $ac_hdr" >&5
-+echo "configure:92759: checking for $ac_hdr" >&5
++echo "configure:93101: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 91785 "configure"
-+#line 92764 "configure"
++#line 93106 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:91790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:92769: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:93111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -92176,7 +93155,7 @@
+@@ -92176,7 +93497,7 @@ EOF
  php_with_sybase_ct=no
  
  echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6
 -echo "configure:92180: checking for Sybase-CT support" >&5
-+echo "configure:93159: checking for Sybase-CT support" >&5
++echo "configure:93501: checking for Sybase-CT support" >&5
  # Check whether --with-sybase-ct or --without-sybase-ct was given.
  if test "${with_sybase_ct+set}" = set; then
    withval="$with_sybase_ct"
-@@ -92828,7 +93807,7 @@
+@@ -92828,7 +94149,7 @@ EOF
    done
  
    echo $ac_n "checking for netg_errstr in -lsybtcl64""... $ac_c" 1>&6
 -echo "configure:92832: checking for netg_errstr in -lsybtcl64" >&5
-+echo "configure:93811: checking for netg_errstr in -lsybtcl64" >&5
++echo "configure:94153: checking for netg_errstr in -lsybtcl64" >&5
  ac_lib_var=`echo sybtcl64'_'netg_errstr | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -92836,7 +93815,7 @@
+@@ -92836,7 +94157,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsybtcl64  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 92840 "configure"
-+#line 93819 "configure"
++#line 94161 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -92847,7 +93826,7 @@
+@@ -92847,7 +94168,7 @@ int main() {
  netg_errstr()
  ; return 0; }
  EOF
 -if { (eval echo configure:92851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:93830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:94172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -93022,7 +94001,7 @@
+@@ -93022,7 +94343,7 @@ fi
    done
  
    echo $ac_n "checking for insck__getVdate in -linsck64""... $ac_c" 1>&6
 -echo "configure:93026: checking for insck__getVdate in -linsck64" >&5
-+echo "configure:94005: checking for insck__getVdate in -linsck64" >&5
++echo "configure:94347: checking for insck__getVdate in -linsck64" >&5
  ac_lib_var=`echo insck64'_'insck__getVdate | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -93030,7 +94009,7 @@
+@@ -93030,7 +94351,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-linsck64  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 93034 "configure"
-+#line 94013 "configure"
++#line 94355 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -93041,7 +94020,7 @@
+@@ -93041,7 +94362,7 @@ int main() {
  insck__getVdate()
  ; return 0; }
  EOF
 -if { (eval echo configure:93045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:94024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:94366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -93189,7 +94168,7 @@
+@@ -93189,7 +94510,7 @@ fi
    done
  
    echo $ac_n "checking for bsd_tcp in -linsck64""... $ac_c" 1>&6
 -echo "configure:93193: checking for bsd_tcp in -linsck64" >&5
-+echo "configure:94172: checking for bsd_tcp in -linsck64" >&5
++echo "configure:94514: checking for bsd_tcp in -linsck64" >&5
  ac_lib_var=`echo insck64'_'bsd_tcp | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -93197,7 +94176,7 @@
+@@ -93197,7 +94518,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-linsck64  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 93201 "configure"
-+#line 94180 "configure"
++#line 94522 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -93208,7 +94187,7 @@
+@@ -93208,7 +94529,7 @@ int main() {
  bsd_tcp()
  ; return 0; }
  EOF
 -if { (eval echo configure:93212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:94191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:94533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -93454,7 +94433,7 @@
+@@ -93454,7 +94775,7 @@ fi
    done
  
    echo $ac_n "checking for netg_errstr in -lsybtcl""... $ac_c" 1>&6
 -echo "configure:93458: checking for netg_errstr in -lsybtcl" >&5
-+echo "configure:94437: checking for netg_errstr in -lsybtcl" >&5
++echo "configure:94779: checking for netg_errstr in -lsybtcl" >&5
  ac_lib_var=`echo sybtcl'_'netg_errstr | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -93462,7 +94441,7 @@
+@@ -93462,7 +94783,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsybtcl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 93466 "configure"
-+#line 94445 "configure"
++#line 94787 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -93473,7 +94452,7 @@
+@@ -93473,7 +94794,7 @@ int main() {
  netg_errstr()
  ; return 0; }
  EOF
 -if { (eval echo configure:93477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:94456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:94798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -93648,7 +94627,7 @@
+@@ -93648,7 +94969,7 @@ fi
    done
  
    echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
 -echo "configure:93652: checking for insck__getVdate in -linsck" >&5
-+echo "configure:94631: checking for insck__getVdate in -linsck" >&5
++echo "configure:94973: checking for insck__getVdate in -linsck" >&5
  ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -93656,7 +94635,7 @@
+@@ -93656,7 +94977,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-linsck  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 93660 "configure"
-+#line 94639 "configure"
++#line 94981 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -93667,7 +94646,7 @@
+@@ -93667,7 +94988,7 @@ int main() {
  insck__getVdate()
  ; return 0; }
  EOF
 -if { (eval echo configure:93671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:94650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:94992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -93815,7 +94794,7 @@
+@@ -93815,7 +95136,7 @@ fi
    done
  
    echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6
 -echo "configure:93819: checking for bsd_tcp in -linsck" >&5
-+echo "configure:94798: checking for bsd_tcp in -linsck" >&5
++echo "configure:95140: checking for bsd_tcp in -linsck" >&5
  ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -93823,7 +94802,7 @@
+@@ -93823,7 +95144,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-linsck  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 93827 "configure"
-+#line 94806 "configure"
++#line 95148 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -93834,7 +94813,7 @@
+@@ -93834,7 +95155,7 @@ int main() {
  bsd_tcp()
  ; return 0; }
  EOF
 -if { (eval echo configure:93838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:94817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:95159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -94080,7 +95059,7 @@
+@@ -94080,7 +95401,7 @@ fi
    done
  
    echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6
 -echo "configure:94084: checking for netg_errstr in -ltcl" >&5
-+echo "configure:95063: checking for netg_errstr in -ltcl" >&5
++echo "configure:95405: checking for netg_errstr in -ltcl" >&5
  ac_lib_var=`echo tcl'_'netg_errstr | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -94088,7 +95067,7 @@
+@@ -94088,7 +95409,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ltcl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 94092 "configure"
-+#line 95071 "configure"
++#line 95413 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -94099,7 +95078,7 @@
+@@ -94099,7 +95420,7 @@ int main() {
  netg_errstr()
  ; return 0; }
  EOF
 -if { (eval echo configure:94103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:95082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:95424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -94274,7 +95253,7 @@
+@@ -94274,7 +95595,7 @@ fi
    done
  
    echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6
 -echo "configure:94278: checking for insck__getVdate in -linsck" >&5
-+echo "configure:95257: checking for insck__getVdate in -linsck" >&5
++echo "configure:95599: checking for insck__getVdate in -linsck" >&5
  ac_lib_var=`echo insck'_'insck__getVdate | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -94282,7 +95261,7 @@
+@@ -94282,7 +95603,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-linsck  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 94286 "configure"
-+#line 95265 "configure"
++#line 95607 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -94293,7 +95272,7 @@
+@@ -94293,7 +95614,7 @@ int main() {
  insck__getVdate()
  ; return 0; }
  EOF
 -if { (eval echo configure:94297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:95276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:95618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -94441,7 +95420,7 @@
+@@ -94441,7 +95762,7 @@ fi
    done
  
    echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6
 -echo "configure:94445: checking for bsd_tcp in -linsck" >&5
-+echo "configure:95424: checking for bsd_tcp in -linsck" >&5
++echo "configure:95766: checking for bsd_tcp in -linsck" >&5
  ac_lib_var=`echo insck'_'bsd_tcp | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -94449,7 +95428,7 @@
+@@ -94449,7 +95770,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-linsck  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 94453 "configure"
-+#line 95432 "configure"
++#line 95774 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -94460,7 +95439,7 @@
+@@ -94460,7 +95781,7 @@ int main() {
  bsd_tcp()
  ; return 0; }
  EOF
 -if { (eval echo configure:94464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:95443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:95785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -94520,7 +95499,7 @@
+@@ -94520,7 +95841,7 @@ fi
  php_enable_sysvmsg=no
  
  echo $ac_n "checking whether to enable System V IPC support""... $ac_c" 1>&6
 -echo "configure:94524: checking whether to enable System V IPC support" >&5
-+echo "configure:95503: checking whether to enable System V IPC support" >&5
++echo "configure:95845: checking whether to enable System V IPC support" >&5
  # Check whether --enable-sysvmsg or --disable-sysvmsg was given.
  if test "${enable_sysvmsg+set}" = set; then
    enableval="$enable_sysvmsg"
-@@ -94563,17 +95542,17 @@
+@@ -94563,17 +95884,17 @@ echo "$ac_t""$ext_output" 1>&6
  if test "$PHP_SYSVMSG" != "no"; then
    ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
 -echo "configure:94567: checking for sys/msg.h" >&5
-+echo "configure:95546: checking for sys/msg.h" >&5
++echo "configure:95888: checking for sys/msg.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 94572 "configure"
-+#line 95551 "configure"
++#line 95893 "configure"
  #include "confdefs.h"
  #include <sys/msg.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:94577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:95556: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:95898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -94900,7 +95879,7 @@
+@@ -94900,7 +96221,7 @@ fi
  php_enable_sysvsem=no
  
  echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6
 -echo "configure:94904: checking whether to enable System V semaphore support" >&5
-+echo "configure:95883: checking whether to enable System V semaphore support" >&5
++echo "configure:96225: checking whether to enable System V semaphore support" >&5
  # Check whether --enable-sysvsem or --disable-sysvsem was given.
  if test "${enable_sysvsem+set}" = set; then
    enableval="$enable_sysvsem"
-@@ -95238,12 +96217,12 @@
+@@ -95238,12 +96559,12 @@ EOF
  EOF
  
   echo $ac_n "checking for union semun""... $ac_c" 1>&6
 -echo "configure:95242: checking for union semun" >&5
-+echo "configure:96221: checking for union semun" >&5
++echo "configure:96563: checking for union semun" >&5
  if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 95247 "configure"
-+#line 96226 "configure"
++#line 96568 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -95254,7 +96233,7 @@
+@@ -95254,7 +96575,7 @@ int main() {
  union semun x;
  ; return 0; }
  EOF
 -if { (eval echo configure:95258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:96237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:96579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
       php_cv_semun=yes
-@@ -95290,7 +96269,7 @@
+@@ -95290,7 +96611,7 @@ fi
  php_enable_sysvshm=no
  
  echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6
 -echo "configure:95294: checking whether to enable System V shared memory support" >&5
-+echo "configure:96273: checking whether to enable System V shared memory support" >&5
++echo "configure:96615: checking whether to enable System V shared memory support" >&5
  # Check whether --enable-sysvshm or --disable-sysvshm was given.
  if test "${enable_sysvshm+set}" = set; then
    enableval="$enable_sysvshm"
-@@ -95634,7 +96613,7 @@
+@@ -95634,7 +96955,7 @@ fi
  php_with_tidy=no
  
  echo $ac_n "checking for TIDY support""... $ac_c" 1>&6
 -echo "configure:95638: checking for TIDY support" >&5
-+echo "configure:96617: checking for TIDY support" >&5
++echo "configure:96959: checking for TIDY support" >&5
  # Check whether --with-tidy or --without-tidy was given.
  if test "${with_tidy+set}" = set; then
    withval="$with_tidy"
-@@ -95923,7 +96902,7 @@
+@@ -95923,7 +97244,7 @@ if test "$PHP_TIDY" != "no"; then
    done
  
    echo $ac_n "checking for tidyOptGetDoc in -ltidy""... $ac_c" 1>&6
 -echo "configure:95927: checking for tidyOptGetDoc in -ltidy" >&5
-+echo "configure:96906: checking for tidyOptGetDoc in -ltidy" >&5
++echo "configure:97248: checking for tidyOptGetDoc in -ltidy" >&5
  ac_lib_var=`echo tidy'_'tidyOptGetDoc | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -95931,7 +96910,7 @@
+@@ -95931,7 +97252,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ltidy  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 95935 "configure"
-+#line 96914 "configure"
++#line 97256 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -95942,7 +96921,7 @@
+@@ -95942,7 +97263,7 @@ int main() {
  tidyOptGetDoc()
  ; return 0; }
  EOF
 -if { (eval echo configure:95946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:96925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:97267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -96286,7 +97265,7 @@
+@@ -96286,7 +97607,7 @@ fi
  php_enable_tokenizer=yes
  
  echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6
 -echo "configure:96290: checking whether to enable tokenizer support" >&5
-+echo "configure:97269: checking whether to enable tokenizer support" >&5
++echo "configure:97611: checking whether to enable tokenizer support" >&5
  # Check whether --enable-tokenizer or --disable-tokenizer was given.
  if test "${enable_tokenizer+set}" = set; then
    enableval="$enable_tokenizer"
-@@ -96632,7 +97611,7 @@
+@@ -96632,7 +97953,7 @@ fi
  php_enable_wddx=no
  
  echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6
 -echo "configure:96636: checking whether to enable WDDX support" >&5
-+echo "configure:97615: checking whether to enable WDDX support" >&5
++echo "configure:97957: checking whether to enable WDDX support" >&5
  # Check whether --enable-wddx or --disable-wddx was given.
  if test "${enable_wddx+set}" = set; then
    enableval="$enable_wddx"
-@@ -96677,7 +97656,7 @@
+@@ -96677,7 +97998,7 @@ if test -z "$PHP_LIBXML_DIR"; then
  php_with_libxml_dir=no
  
  echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
 -echo "configure:96681: checking libxml2 install dir" >&5
-+echo "configure:97660: checking libxml2 install dir" >&5
++echo "configure:98002: checking libxml2 install dir" >&5
  # Check whether --with-libxml-dir or --without-libxml-dir was given.
  if test "${with_libxml_dir+set}" = set; then
    withval="$with_libxml_dir"
-@@ -96701,7 +97680,7 @@
+@@ -96701,7 +98022,7 @@ fi
  php_with_libexpat_dir=no
  
  echo $ac_n "checking libexpat dir for WDDX""... $ac_c" 1>&6
 -echo "configure:96705: checking libexpat dir for WDDX" >&5
-+echo "configure:97684: checking libexpat dir for WDDX" >&5
++echo "configure:98026: checking libexpat dir for WDDX" >&5
  # Check whether --with-libexpat-dir or --without-libexpat-dir was given.
  if test "${with_libexpat_dir+set}" = set; then
    withval="$with_libexpat_dir"
-@@ -96729,7 +97708,7 @@
+@@ -96729,7 +98050,7 @@ if test "$PHP_WDDX" != "no"; then
  
      
  echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
 -echo "configure:96733: checking for xml2-config path" >&5
-+echo "configure:97712: checking for xml2-config path" >&5
++echo "configure:98054: checking for xml2-config path" >&5
  if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -96887,7 +97866,7 @@
+@@ -96887,7 +98208,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
  
  
              echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
 -echo "configure:96891: checking whether libxml build works" >&5
-+echo "configure:97870: checking whether libxml build works" >&5
++echo "configure:98212: checking whether libxml build works" >&5
  if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -96903,7 +97882,7 @@
+@@ -96903,7 +98224,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 96907 "configure"
-+#line 97886 "configure"
++#line 98228 "configure"
  #include "confdefs.h"
  
      
-@@ -96914,7 +97893,7 @@
+@@ -96914,7 +98235,7 @@ else
      }
    
  EOF
 -if { (eval echo configure:96918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:97897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:98239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      LIBS=$old_LIBS
-@@ -97481,7 +98460,7 @@
+@@ -97481,7 +98802,7 @@ fi
  php_enable_xml=yes
  
  echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6
 -echo "configure:97485: checking whether to enable XML support" >&5
-+echo "configure:98464: checking whether to enable XML support" >&5
++echo "configure:98806: checking whether to enable XML support" >&5
  # Check whether --enable-xml or --disable-xml was given.
  if test "${enable_xml+set}" = set; then
    enableval="$enable_xml"
-@@ -97526,7 +98505,7 @@
+@@ -97526,7 +98847,7 @@ if test -z "$PHP_LIBXML_DIR"; then
  php_with_libxml_dir=no
  
  echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
 -echo "configure:97530: checking libxml2 install dir" >&5
-+echo "configure:98509: checking libxml2 install dir" >&5
++echo "configure:98851: checking libxml2 install dir" >&5
  # Check whether --with-libxml-dir or --without-libxml-dir was given.
  if test "${with_libxml_dir+set}" = set; then
    withval="$with_libxml_dir"
-@@ -97550,7 +98529,7 @@
+@@ -97550,7 +98871,7 @@ fi
  php_with_libexpat_dir=no
  
  echo $ac_n "checking libexpat install dir""... $ac_c" 1>&6
 -echo "configure:97554: checking libexpat install dir" >&5
-+echo "configure:98533: checking libexpat install dir" >&5
++echo "configure:98875: checking libexpat install dir" >&5
  # Check whether --with-libexpat-dir or --without-libexpat-dir was given.
  if test "${with_libexpat_dir+set}" = set; then
    withval="$with_libexpat_dir"
-@@ -97579,7 +98558,7 @@
+@@ -97579,7 +98900,7 @@ if test "$PHP_XML" != "no"; then
  
      
  echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
 -echo "configure:97583: checking for xml2-config path" >&5
-+echo "configure:98562: checking for xml2-config path" >&5
++echo "configure:98904: checking for xml2-config path" >&5
  if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -97737,7 +98716,7 @@
+@@ -97737,7 +99058,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
  
  
              echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
 -echo "configure:97741: checking whether libxml build works" >&5
-+echo "configure:98720: checking whether libxml build works" >&5
++echo "configure:99062: checking whether libxml build works" >&5
  if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -97753,7 +98732,7 @@
+@@ -97753,7 +99074,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 97757 "configure"
-+#line 98736 "configure"
++#line 99078 "configure"
  #include "confdefs.h"
  
      
-@@ -97764,7 +98743,7 @@
+@@ -97764,7 +99085,7 @@ else
      }
    
  EOF
 -if { (eval echo configure:97768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:98747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:99089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      LIBS=$old_LIBS
-@@ -98300,7 +99279,7 @@
+@@ -98300,7 +99621,7 @@ fi
  php_enable_xmlreader=yes
  
  echo $ac_n "checking whether to enable XMLReader support""... $ac_c" 1>&6
 -echo "configure:98304: checking whether to enable XMLReader support" >&5
-+echo "configure:99283: checking whether to enable XMLReader support" >&5
++echo "configure:99625: checking whether to enable XMLReader support" >&5
  # Check whether --enable-xmlreader or --disable-xmlreader was given.
  if test "${enable_xmlreader+set}" = set; then
    enableval="$enable_xmlreader"
-@@ -98345,7 +99324,7 @@
+@@ -98345,7 +99666,7 @@ if test -z "$PHP_LIBXML_DIR"; then
  php_with_libxml_dir=no
  
  echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
 -echo "configure:98349: checking libxml2 install dir" >&5
-+echo "configure:99328: checking libxml2 install dir" >&5
++echo "configure:99670: checking libxml2 install dir" >&5
  # Check whether --with-libxml-dir or --without-libxml-dir was given.
  if test "${with_libxml_dir+set}" = set; then
    withval="$with_libxml_dir"
-@@ -98373,7 +99352,7 @@
+@@ -98373,7 +99694,7 @@ if test "$PHP_XMLREADER" != "no"; then
  
    
  echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
 -echo "configure:98377: checking for xml2-config path" >&5
-+echo "configure:99356: checking for xml2-config path" >&5
++echo "configure:99698: checking for xml2-config path" >&5
  if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -98531,7 +99510,7 @@
+@@ -98531,7 +99852,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
  
  
              echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
 -echo "configure:98535: checking whether libxml build works" >&5
-+echo "configure:99514: checking whether libxml build works" >&5
++echo "configure:99856: checking whether libxml build works" >&5
  if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -98547,7 +99526,7 @@
+@@ -98547,7 +99868,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 98551 "configure"
-+#line 99530 "configure"
++#line 99872 "configure"
  #include "confdefs.h"
  
      
-@@ -98558,7 +99537,7 @@
+@@ -98558,7 +99879,7 @@ else
      }
    
  EOF
 -if { (eval echo configure:98562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:99541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:99883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      LIBS=$old_LIBS
-@@ -98940,7 +99919,7 @@
+@@ -98940,7 +100261,7 @@ fi
  php_with_xmlrpc=no
  
  echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6
 -echo "configure:98944: checking for XMLRPC-EPI support" >&5
-+echo "configure:99923: checking for XMLRPC-EPI support" >&5
++echo "configure:100265: checking for XMLRPC-EPI support" >&5
  # Check whether --with-xmlrpc or --without-xmlrpc was given.
  if test "${with_xmlrpc+set}" = set; then
    withval="$with_xmlrpc"
-@@ -98985,7 +99964,7 @@
+@@ -98985,7 +100306,7 @@ if test -z "$PHP_LIBXML_DIR"; then
  php_with_libxml_dir=no
  
  echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
 -echo "configure:98989: checking libxml2 install dir" >&5
-+echo "configure:99968: checking libxml2 install dir" >&5
++echo "configure:100310: checking libxml2 install dir" >&5
  # Check whether --with-libxml-dir or --without-libxml-dir was given.
  if test "${with_libxml_dir+set}" = set; then
    withval="$with_libxml_dir"
-@@ -99009,7 +99988,7 @@
+@@ -99009,7 +100330,7 @@ fi
  php_with_libexpat_dir=no
  
  echo $ac_n "checking libexpat dir for XMLRPC-EPI""... $ac_c" 1>&6
 -echo "configure:99013: checking libexpat dir for XMLRPC-EPI" >&5
-+echo "configure:99992: checking libexpat dir for XMLRPC-EPI" >&5
++echo "configure:100334: checking libexpat dir for XMLRPC-EPI" >&5
  # Check whether --with-libexpat-dir or --without-libexpat-dir was given.
  if test "${with_libexpat_dir+set}" = set; then
    withval="$with_libexpat_dir"
-@@ -99032,7 +100011,7 @@
+@@ -99032,7 +100353,7 @@ echo "$ac_t""$ext_output" 1>&6
  php_with_iconv_dir=no
  
  echo $ac_n "checking iconv dir for XMLRPC-EPI""... $ac_c" 1>&6
 -echo "configure:99036: checking iconv dir for XMLRPC-EPI" >&5
-+echo "configure:100015: checking iconv dir for XMLRPC-EPI" >&5
++echo "configure:100357: checking iconv dir for XMLRPC-EPI" >&5
  # Check whether --with-iconv-dir or --without-iconv-dir was given.
  if test "${with_iconv_dir+set}" = set; then
    withval="$with_iconv_dir"
-@@ -99088,7 +100067,7 @@
+@@ -99088,7 +100409,7 @@ EOF
  
      
  echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
 -echo "configure:99092: checking for xml2-config path" >&5
-+echo "configure:100071: checking for xml2-config path" >&5
++echo "configure:100413: checking for xml2-config path" >&5
  if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -99246,7 +100225,7 @@
+@@ -99246,7 +100567,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
  
  
              echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
 -echo "configure:99250: checking whether libxml build works" >&5
-+echo "configure:100229: checking whether libxml build works" >&5
++echo "configure:100571: checking whether libxml build works" >&5
  if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -99262,7 +100241,7 @@
+@@ -99262,7 +100583,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 99266 "configure"
-+#line 100245 "configure"
++#line 100587 "configure"
  #include "confdefs.h"
  
      
-@@ -99273,7 +100252,7 @@
+@@ -99273,7 +100594,7 @@ else
      }
    
  EOF
 -if { (eval echo configure:99277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:100256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:100598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      LIBS=$old_LIBS
-@@ -99542,12 +100521,12 @@
+@@ -99542,12 +100863,12 @@ EOF
  
          if test "$PHP_ICONV" = "yes"; then
      echo $ac_n "checking for iconv""... $ac_c" 1>&6
 -echo "configure:99546: checking for iconv" >&5
-+echo "configure:100525: checking for iconv" >&5
++echo "configure:100867: checking for iconv" >&5
  if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 99551 "configure"
-+#line 100530 "configure"
++#line 100872 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char iconv(); below.  */
-@@ -99570,7 +100549,7 @@
+@@ -99570,7 +100891,7 @@ iconv();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:99574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:100553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:100895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_iconv=yes"
  else
-@@ -99591,12 +100570,12 @@
+@@ -99591,12 +100912,12 @@ else
    echo "$ac_t""no" 1>&6
  
        echo $ac_n "checking for libiconv""... $ac_c" 1>&6
 -echo "configure:99595: checking for libiconv" >&5
-+echo "configure:100574: checking for libiconv" >&5
++echo "configure:100916: checking for libiconv" >&5
  if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 99600 "configure"
-+#line 100579 "configure"
++#line 100921 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char libiconv(); below.  */
-@@ -99619,7 +100598,7 @@
+@@ -99619,7 +100940,7 @@ libiconv();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:99623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:100602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:100944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_libiconv=yes"
  else
-@@ -99775,7 +100754,7 @@
+@@ -99775,7 +101096,7 @@ EOF
    done
  
    echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6
 -echo "configure:99779: checking for libiconv in -l$iconv_lib_name" >&5
-+echo "configure:100758: checking for libiconv in -l$iconv_lib_name" >&5
++echo "configure:101100: checking for libiconv in -l$iconv_lib_name" >&5
  ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -99783,7 +100762,7 @@
+@@ -99783,7 +101104,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$iconv_lib_name  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 99787 "configure"
-+#line 100766 "configure"
++#line 101108 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -99794,7 +100773,7 @@
+@@ -99794,7 +101115,7 @@ int main() {
  libiconv()
  ; return 0; }
  EOF
 -if { (eval echo configure:99798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:100777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:101119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -99935,7 +100914,7 @@
+@@ -99935,7 +101256,7 @@ else
    done
  
    echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6
 -echo "configure:99939: checking for iconv in -l$iconv_lib_name" >&5
-+echo "configure:100918: checking for iconv in -l$iconv_lib_name" >&5
++echo "configure:101260: checking for iconv in -l$iconv_lib_name" >&5
  ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -99943,7 +100922,7 @@
+@@ -99943,7 +101264,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$iconv_lib_name  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 99947 "configure"
-+#line 100926 "configure"
++#line 101268 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -99954,7 +100933,7 @@
+@@ -99954,7 +101275,7 @@ int main() {
  iconv()
  ; return 0; }
  EOF
 -if { (eval echo configure:99958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:100937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:101279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -100144,7 +101123,7 @@
+@@ -100144,7 +101465,7 @@ if test "$PHP_XMLRPC" = "yes"; then
    # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:100148: checking for $ac_word" >&5
-+echo "configure:101127: checking for $ac_word" >&5
++echo "configure:101469: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -100172,21 +101151,21 @@
+@@ -100172,21 +101493,21 @@ else
  fi
  
  echo $ac_n "checking for inline""... $ac_c" 1>&6
 -echo "configure:100176: checking for inline" >&5
-+echo "configure:101155: checking for inline" >&5
++echo "configure:101497: checking for inline" >&5
  if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -16569,7 +16921,7 @@
  for ac_kw in inline __inline__ __inline; do
    cat > conftest.$ac_ext <<EOF
 -#line 100183 "configure"
-+#line 101162 "configure"
++#line 101504 "configure"
  #include "confdefs.h"
  
  int main() {
@@ -16577,106 +16929,106 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:100190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:101169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:101511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_inline=$ac_kw; break
  else
-@@ -100224,12 +101203,12 @@
+@@ -100224,12 +101545,12 @@ EOF
  
  
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
 -echo "configure:100228: checking for ANSI C header files" >&5
-+echo "configure:101207: checking for ANSI C header files" >&5
++echo "configure:101549: checking for ANSI C header files" >&5
  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 100233 "configure"
-+#line 101212 "configure"
++#line 101554 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -100237,7 +101216,7 @@
+@@ -100237,7 +101558,7 @@ else
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:100241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:101220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:101562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -100254,7 +101233,7 @@
+@@ -100254,7 +101575,7 @@ rm -f conftest*
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
 -#line 100258 "configure"
-+#line 101237 "configure"
++#line 101579 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
-@@ -100272,7 +101251,7 @@
+@@ -100272,7 +101593,7 @@ fi
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
 -#line 100276 "configure"
-+#line 101255 "configure"
++#line 101597 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
-@@ -100293,7 +101272,7 @@
+@@ -100293,7 +101614,7 @@ if test "$cross_compiling" = yes; then
    :
  else
    cat > conftest.$ac_ext <<EOF
 -#line 100297 "configure"
-+#line 101276 "configure"
++#line 101618 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -100304,7 +101283,7 @@
+@@ -100304,7 +101625,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
  exit (0); }
  
  EOF
 -if { (eval echo configure:100308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:101287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:101629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
-@@ -100331,17 +101310,17 @@
+@@ -100331,17 +101652,17 @@ for ac_hdr in xmlparse.h xmltok.h stdlib.h strings.h string.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:100335: checking for $ac_hdr" >&5
-+echo "configure:101314: checking for $ac_hdr" >&5
++echo "configure:101656: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 100340 "configure"
-+#line 101319 "configure"
++#line 101661 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:100345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:101324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:101666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -100373,7 +101352,7 @@
+@@ -100373,7 +101694,7 @@ done
  
  
  echo $ac_n "checking size of char""... $ac_c" 1>&6
 -echo "configure:100377: checking size of char" >&5
-+echo "configure:101356: checking size of char" >&5
++echo "configure:101698: checking size of char" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -100381,18 +101360,19 @@
+@@ -100381,18 +101702,19 @@ else
    ac_cv_sizeof_char=1
  else
    cat > conftest.$ac_ext <<EOF
 -#line 100385 "configure"
-+#line 101364 "configure"
++#line 101706 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -16692,25 +17044,25 @@
  }
  EOF
 -if { (eval echo configure:100396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:101376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:101718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_char=`cat conftestval`
  else
-@@ -100413,7 +101393,7 @@
+@@ -100413,7 +101735,7 @@ EOF
  
  
  echo $ac_n "checking size of int""... $ac_c" 1>&6
 -echo "configure:100417: checking size of int" >&5
-+echo "configure:101397: checking size of int" >&5
++echo "configure:101739: checking size of int" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -100421,18 +101401,19 @@
+@@ -100421,18 +101743,19 @@ else
    ac_cv_sizeof_int=4
  else
    cat > conftest.$ac_ext <<EOF
 -#line 100425 "configure"
-+#line 101405 "configure"
++#line 101747 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -16726,25 +17078,25 @@
  }
  EOF
 -if { (eval echo configure:100436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:101417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:101759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_int=`cat conftestval`
  else
-@@ -100452,7 +101433,7 @@
+@@ -100452,7 +101775,7 @@ EOF
  
  
  echo $ac_n "checking size of long""... $ac_c" 1>&6
 -echo "configure:100456: checking size of long" >&5
-+echo "configure:101437: checking size of long" >&5
++echo "configure:101779: checking size of long" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -100460,18 +101441,19 @@
+@@ -100460,18 +101783,19 @@ else
    ac_cv_sizeof_long=4
  else
    cat > conftest.$ac_ext <<EOF
 -#line 100464 "configure"
-+#line 101445 "configure"
++#line 101787 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -16760,25 +17112,25 @@
  }
  EOF
 -if { (eval echo configure:100475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:101457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:101799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_long=`cat conftestval`
  else
-@@ -100491,7 +101473,7 @@
+@@ -100491,7 +101815,7 @@ EOF
  
  
  echo $ac_n "checking size of long long""... $ac_c" 1>&6
 -echo "configure:100495: checking size of long long" >&5
-+echo "configure:101477: checking size of long long" >&5
++echo "configure:101819: checking size of long long" >&5
  if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -100499,18 +101481,19 @@
+@@ -100499,18 +101823,19 @@ else
    ac_cv_sizeof_long_long=8
  else
    cat > conftest.$ac_ext <<EOF
 -#line 100503 "configure"
-+#line 101485 "configure"
++#line 101827 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -16794,532 +17146,532 @@
  }
  EOF
 -if { (eval echo configure:100514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:101497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:101839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_sizeof_long_long=`cat conftestval`
  else
-@@ -100530,12 +101513,12 @@
+@@ -100530,12 +101855,12 @@ EOF
  
  
  echo $ac_n "checking for size_t""... $ac_c" 1>&6
 -echo "configure:100534: checking for size_t" >&5
-+echo "configure:101517: checking for size_t" >&5
++echo "configure:101859: checking for size_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 100539 "configure"
-+#line 101522 "configure"
++#line 101864 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -100563,12 +101546,12 @@
+@@ -100563,12 +101888,12 @@ EOF
  fi
  
  echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
 -echo "configure:100567: checking whether time.h and sys/time.h may both be included" >&5
-+echo "configure:101550: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:101892: checking whether time.h and sys/time.h may both be included" >&5
  if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 100572 "configure"
-+#line 101555 "configure"
++#line 101897 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/time.h>
-@@ -100577,7 +101560,7 @@
+@@ -100577,7 +101902,7 @@ int main() {
  struct tm *tp;
  ; return 0; }
  EOF
 -if { (eval echo configure:100581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:101564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:101906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_header_time=yes
  else
-@@ -100598,12 +101581,12 @@
+@@ -100598,12 +101923,12 @@ EOF
  fi
  
  echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
 -echo "configure:100602: checking for uid_t in sys/types.h" >&5
-+echo "configure:101585: checking for uid_t in sys/types.h" >&5
++echo "configure:101927: checking for uid_t in sys/types.h" >&5
  if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 100607 "configure"
-+#line 101590 "configure"
++#line 101932 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  EOF
-@@ -100643,12 +101626,12 @@
+@@ -100643,12 +101968,12 @@ for ac_func in \
   memcpy memmove
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:100647: checking for $ac_func" >&5
-+echo "configure:101630: checking for $ac_func" >&5
++echo "configure:101972: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 100652 "configure"
-+#line 101635 "configure"
++#line 101977 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -100671,7 +101654,7 @@
+@@ -100671,7 +101996,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:100675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:101658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:102000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -101025,7 +102008,7 @@
+@@ -101025,7 +102350,7 @@ elif test "$PHP_XMLRPC" != "no"; then
      XMLRPC_DIR=$PHP_XMLRPC/include/xmlrpc-epi
    else
      echo $ac_n "checking for XMLRPC-EPI in default path""... $ac_c" 1>&6
 -echo "configure:101029: checking for XMLRPC-EPI in default path" >&5
-+echo "configure:102012: checking for XMLRPC-EPI in default path" >&5
++echo "configure:102354: checking for XMLRPC-EPI in default path" >&5
      for i in /usr/local /usr; do
        if test -r $i/include/xmlrpc.h; then
          XMLRPC_DIR=$i/include
-@@ -101468,7 +102451,7 @@
+@@ -101468,7 +102793,7 @@ fi
  php_enable_xmlwriter=yes
  
  echo $ac_n "checking whether to enable XMLWriter support""... $ac_c" 1>&6
 -echo "configure:101472: checking whether to enable XMLWriter support" >&5
-+echo "configure:102455: checking whether to enable XMLWriter support" >&5
++echo "configure:102797: checking whether to enable XMLWriter support" >&5
  # Check whether --enable-xmlwriter or --disable-xmlwriter was given.
  if test "${enable_xmlwriter+set}" = set; then
    enableval="$enable_xmlwriter"
-@@ -101513,7 +102496,7 @@
+@@ -101513,7 +102838,7 @@ if test -z "$PHP_LIBXML_DIR"; then
  php_with_libxml_dir=no
  
  echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6
 -echo "configure:101517: checking libxml2 install dir" >&5
-+echo "configure:102500: checking libxml2 install dir" >&5
++echo "configure:102842: checking libxml2 install dir" >&5
  # Check whether --with-libxml-dir or --without-libxml-dir was given.
  if test "${with_libxml_dir+set}" = set; then
    withval="$with_libxml_dir"
-@@ -101541,7 +102524,7 @@
+@@ -101541,7 +102866,7 @@ if test "$PHP_XMLWRITER" != "no"; then
  
    
  echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6
 -echo "configure:101545: checking for xml2-config path" >&5
-+echo "configure:102528: checking for xml2-config path" >&5
++echo "configure:102870: checking for xml2-config path" >&5
  if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -101699,7 +102682,7 @@
+@@ -101699,7 +103024,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
  
  
              echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
 -echo "configure:101703: checking whether libxml build works" >&5
-+echo "configure:102686: checking whether libxml build works" >&5
++echo "configure:103028: checking whether libxml build works" >&5
  if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -101715,7 +102698,7 @@
+@@ -101715,7 +103040,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 101719 "configure"
-+#line 102702 "configure"
++#line 103044 "configure"
  #include "confdefs.h"
  
      
-@@ -101726,7 +102709,7 @@
+@@ -101726,7 +103051,7 @@ else
      }
    
  EOF
 -if { (eval echo configure:101730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:102713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:103055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      LIBS=$old_LIBS
-@@ -102076,7 +103059,7 @@
+@@ -102076,7 +103401,7 @@ fi
  php_with_xsl=no
  
  echo $ac_n "checking for XSL support""... $ac_c" 1>&6
 -echo "configure:102080: checking for XSL support" >&5
-+echo "configure:103063: checking for XSL support" >&5
++echo "configure:103405: checking for XSL support" >&5
  # Check whether --with-xsl or --without-xsl was given.
  if test "${with_xsl+set}" = set; then
    withval="$with_xsl"
-@@ -102276,7 +103259,7 @@
+@@ -102276,7 +103601,7 @@ if test "$PHP_XSL" != "no"; then
  
        
        echo $ac_n "checking for EXSLT support""... $ac_c" 1>&6
 -echo "configure:102280: checking for EXSLT support" >&5
-+echo "configure:103263: checking for EXSLT support" >&5
++echo "configure:103605: checking for EXSLT support" >&5
        for i in $PHP_XSL /usr/local /usr; do
          if test -r "$i/include/libexslt/exslt.h"; then
            PHP_XSL_EXSL_DIR=$i
-@@ -102752,7 +103735,7 @@
+@@ -102752,7 +104077,7 @@ fi
  php_enable_zip=no
  
  echo $ac_n "checking for zip archive read/writesupport""... $ac_c" 1>&6
 -echo "configure:102756: checking for zip archive read/writesupport" >&5
-+echo "configure:103739: checking for zip archive read/writesupport" >&5
++echo "configure:104081: checking for zip archive read/writesupport" >&5
  # Check whether --enable-zip or --disable-zip was given.
  if test "${enable_zip+set}" = set; then
    enableval="$enable_zip"
-@@ -102797,7 +103780,7 @@
+@@ -102797,7 +104122,7 @@ if test -z "$PHP_ZLIB_DIR"; then
  php_with_zlib_dir=no
  
  echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
 -echo "configure:102801: checking for the location of libz" >&5
-+echo "configure:103784: checking for the location of libz" >&5
++echo "configure:104126: checking for the location of libz" >&5
  # Check whether --with-zlib-dir or --without-zlib-dir was given.
  if test "${with_zlib_dir+set}" = set; then
    withval="$with_zlib_dir"
-@@ -102821,7 +103804,7 @@
+@@ -102821,7 +104146,7 @@ fi
  php_with_pcre_dir=no
  
  echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6
 -echo "configure:102825: checking pcre install prefix" >&5
-+echo "configure:103808: checking pcre install prefix" >&5
++echo "configure:104150: checking pcre install prefix" >&5
  # Check whether --with-pcre-dir or --without-pcre-dir was given.
  if test "${with_pcre_dir+set}" = set; then
    withval="$with_pcre_dir"
-@@ -102865,7 +103848,7 @@
+@@ -102865,7 +104190,7 @@ if test "$PHP_ZIP" != "no"; then
    fi
  
      echo $ac_n "checking for the location of zlib""... $ac_c" 1>&6
 -echo "configure:102869: checking for the location of zlib" >&5
-+echo "configure:103852: checking for the location of zlib" >&5
++echo "configure:104194: checking for the location of zlib" >&5
    if test "$PHP_ZLIB_DIR" = "no"; then
      { echo "configure: error: zip support requires ZLIB. Use --with-zlib-dir=<DIR> to specify prefix where ZLIB include and library are located" 1>&2; exit 1; }
    else
-@@ -103003,7 +103986,7 @@
+@@ -103003,7 +104328,7 @@ echo "configure:102869: checking for the location of zlib" >&5
      old_CPPFLAGS=$CPPFLAGS
    CPPFLAGS=$INCLUDES
    cat > conftest.$ac_ext <<EOF
 -#line 103007 "configure"
-+#line 103990 "configure"
++#line 104332 "configure"
  #include "confdefs.h"
  
  #include <main/php_config.h>
-@@ -103022,7 +104005,7 @@
+@@ -103022,7 +104347,7 @@ else
    rm -rf conftest*
    
      cat > conftest.$ac_ext <<EOF
 -#line 103026 "configure"
-+#line 104009 "configure"
++#line 104351 "configure"
  #include "confdefs.h"
  
  #include <main/php_config.h>
-@@ -103390,7 +104373,7 @@
+@@ -103390,7 +104715,7 @@ fi
  php_enable_disable_mysqlnd_compression_support=yes
  
  echo $ac_n "checking whether to disable compressed protocol support in mysqlnd""... $ac_c" 1>&6
 -echo "configure:103394: checking whether to disable compressed protocol support in mysqlnd" >&5
-+echo "configure:104377: checking whether to disable compressed protocol support in mysqlnd" >&5
++echo "configure:104719: checking whether to disable compressed protocol support in mysqlnd" >&5
  # Check whether --enable-disable_mysqlnd_compression_support or --disable-disable_mysqlnd_compression_support was given.
  if test "${enable_disable_mysqlnd_compression_support+set}" = set; then
    enableval="$enable_disable_mysqlnd_compression_support"
-@@ -103435,7 +104418,7 @@
+@@ -103435,7 +104760,7 @@ if test -z "$PHP_ZLIB_DIR"; then
  php_with_zlib_dir=no
  
  echo $ac_n "checking for the location of libz""... $ac_c" 1>&6
 -echo "configure:103439: checking for the location of libz" >&5
-+echo "configure:104422: checking for the location of libz" >&5
++echo "configure:104764: checking for the location of libz" >&5
  # Check whether --with-zlib-dir or --without-zlib-dir was given.
  if test "${with_zlib_dir+set}" = set; then
    withval="$with_zlib_dir"
-@@ -103901,7 +104884,7 @@
+@@ -103901,7 +105226,7 @@ if test "$PHP_MYSQLND_ENABLED" = "yes" || test "$PHP_MYSQLI" != "no"; then
      
    for php_typename in int8 uint8 int16 uint16 int32 uint32 uchar ulong int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t; do
      echo $ac_n "checking whether $php_typename exists""... $ac_c" 1>&6
 -echo "configure:103905: checking whether $php_typename exists" >&5
-+echo "configure:104888: checking whether $php_typename exists" >&5
++echo "configure:105230: checking whether $php_typename exists" >&5
      
    php_cache_value=php_cv_sizeof_$php_typename
    if eval "test \"`echo '$''{'php_cv_sizeof_$php_typename'+set}'`\" = set"; then
-@@ -103918,7 +104901,7 @@
+@@ -103918,7 +105243,7 @@ else
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 103922 "configure"
-+#line 104905 "configure"
++#line 105247 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  #if STDC_HEADERS
-@@ -103948,7 +104931,7 @@
+@@ -103948,7 +105273,7 @@ int main()
  }
    
  EOF
 -if { (eval echo configure:103952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:104935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:105277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
      eval $php_cache_value=`cat conftestval`
-@@ -104088,7 +105071,7 @@
+@@ -104088,7 +105413,7 @@ if test "$PHP_RECODE" != "no"; then
    done
  
    echo $ac_n "checking for hash_insert in -l$MYSQL_LIBNAME""... $ac_c" 1>&6
 -echo "configure:104092: checking for hash_insert in -l$MYSQL_LIBNAME" >&5
-+echo "configure:105075: checking for hash_insert in -l$MYSQL_LIBNAME" >&5
++echo "configure:105417: checking for hash_insert in -l$MYSQL_LIBNAME" >&5
  ac_lib_var=`echo $MYSQL_LIBNAME'_'hash_insert | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -104096,7 +105079,7 @@
+@@ -104096,7 +105421,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$MYSQL_LIBNAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 104100 "configure"
-+#line 105083 "configure"
++#line 105425 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -104107,7 +105090,7 @@
+@@ -104107,7 +105432,7 @@ int main() {
  hash_insert()
  ; return 0; }
  EOF
 -if { (eval echo configure:104111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:105094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:105436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -104209,7 +105192,7 @@
+@@ -104209,7 +105534,7 @@ fi
  php_with_pear=DEFAULT
  
  echo $ac_n "checking whether to install PEAR""... $ac_c" 1>&6
 -echo "configure:104213: checking whether to install PEAR" >&5
-+echo "configure:105196: checking whether to install PEAR" >&5
++echo "configure:105538: checking whether to install PEAR" >&5
  # Check whether --with-pear or --without-pear was given.
  if test "${with_pear+set}" = set; then
    withval="$with_pear"
-@@ -104311,7 +105294,7 @@
+@@ -104311,7 +105636,7 @@ fi
    bison_version=none
    if test "$YACC"; then
      echo $ac_n "checking for bison version""... $ac_c" 1>&6
 -echo "configure:104315: checking for bison version" >&5
-+echo "configure:105298: checking for bison version" >&5
++echo "configure:105640: checking for bison version" >&5
  if eval "test \"`echo '$''{'php_cv_bison_version'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -104367,17 +105350,17 @@
+@@ -104367,17 +105692,17 @@ dlfcn.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:104371: checking for $ac_hdr" >&5
-+echo "configure:105354: checking for $ac_hdr" >&5
++echo "configure:105696: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 104376 "configure"
-+#line 105359 "configure"
++#line 105701 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:104381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:105364: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:105706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -104405,12 +105388,12 @@
+@@ -104405,12 +105730,12 @@ done
  
  
  echo $ac_n "checking for size_t""... $ac_c" 1>&6
 -echo "configure:104409: checking for size_t" >&5
-+echo "configure:105392: checking for size_t" >&5
++echo "configure:105734: checking for size_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 104414 "configure"
-+#line 105397 "configure"
++#line 105739 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -104438,12 +105421,12 @@
+@@ -104438,12 +105763,12 @@ EOF
  fi
  
  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
 -echo "configure:104442: checking return type of signal handlers" >&5
-+echo "configure:105425: checking return type of signal handlers" >&5
++echo "configure:105767: checking return type of signal handlers" >&5
  if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 104447 "configure"
-+#line 105430 "configure"
++#line 105772 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <signal.h>
-@@ -104460,7 +105443,7 @@
+@@ -104460,7 +105785,7 @@ int main() {
  int i;
  ; return 0; }
  EOF
 -if { (eval echo configure:104464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:105447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:105789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_signal=void
  else
-@@ -104484,12 +105467,12 @@
+@@ -104484,12 +105809,12 @@ EOF
  
  
  echo $ac_n "checking for uint""... $ac_c" 1>&6
 -echo "configure:104488: checking for uint" >&5
-+echo "configure:105471: checking for uint" >&5
++echo "configure:105813: checking for uint" >&5
  if eval "test \"`echo '$''{'ac_cv_type_uint'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 104493 "configure"
-+#line 105476 "configure"
++#line 105818 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -104517,12 +105500,12 @@
+@@ -104517,12 +105842,12 @@ EOF
  fi
  
  echo $ac_n "checking for ulong""... $ac_c" 1>&6
 -echo "configure:104521: checking for ulong" >&5
-+echo "configure:105504: checking for ulong" >&5
++echo "configure:105846: checking for ulong" >&5
  if eval "test \"`echo '$''{'ac_cv_type_ulong'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 104526 "configure"
-+#line 105509 "configure"
++#line 105851 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -104552,9 +105535,9 @@
+@@ -104552,9 +105877,9 @@ fi
  
  
  echo $ac_n "checking for int32_t""... $ac_c" 1>&6
 -echo "configure:104556: checking for int32_t" >&5
-+echo "configure:105539: checking for int32_t" >&5
++echo "configure:105881: checking for int32_t" >&5
  cat > conftest.$ac_ext <<EOF
 -#line 104558 "configure"
-+#line 105541 "configure"
++#line 105883 "configure"
  #include "confdefs.h"
  
  #if HAVE_SYS_TYPES_H  
-@@ -104573,7 +105556,7 @@
+@@ -104573,7 +105898,7 @@ if (sizeof (int32_t))
  
  ; return 0; }
  EOF
 -if { (eval echo configure:104577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:105560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:105902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
    cat >> confdefs.h <<EOF
-@@ -104592,9 +105575,9 @@
+@@ -104592,9 +105917,9 @@ fi
  rm -f conftest*
  
  echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
 -echo "configure:104596: checking for uint32_t" >&5
-+echo "configure:105579: checking for uint32_t" >&5
++echo "configure:105921: checking for uint32_t" >&5
  cat > conftest.$ac_ext <<EOF
 -#line 104598 "configure"
-+#line 105581 "configure"
++#line 105923 "configure"
  #include "confdefs.h"
  
  #if HAVE_SYS_TYPES_H  
-@@ -104613,7 +105596,7 @@
+@@ -104613,7 +105938,7 @@ if (sizeof (uint32_t))
  
  ; return 0; }
  EOF
 -if { (eval echo configure:104617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:105600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:105942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
    cat >> confdefs.h <<EOF
-@@ -104632,12 +105615,12 @@
+@@ -104632,12 +105957,12 @@ fi
  rm -f conftest*
  
  echo $ac_n "checking for vprintf""... $ac_c" 1>&6
 -echo "configure:104636: checking for vprintf" >&5
-+echo "configure:105619: checking for vprintf" >&5
++echo "configure:105961: checking for vprintf" >&5
  if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 104641 "configure"
-+#line 105624 "configure"
++#line 105966 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char vprintf(); below.  */
-@@ -104660,7 +105643,7 @@
+@@ -104660,7 +105985,7 @@ vprintf();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:104664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:105647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:105989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_vprintf=yes"
  else
-@@ -104684,12 +105667,12 @@
+@@ -104684,12 +106009,12 @@ fi
  
  if test "$ac_cv_func_vprintf" != yes; then
  echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
 -echo "configure:104688: checking for _doprnt" >&5
-+echo "configure:105671: checking for _doprnt" >&5
++echo "configure:106013: checking for _doprnt" >&5
  if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 104693 "configure"
-+#line 105676 "configure"
++#line 106018 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char _doprnt(); below.  */
-@@ -104712,7 +105695,7 @@
+@@ -104712,7 +106037,7 @@ _doprnt();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:104716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:105699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:106041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func__doprnt=yes"
  else
-@@ -104737,7 +105720,7 @@
+@@ -104737,7 +106062,7 @@ fi
  fi
  
  echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
 -echo "configure:104741: checking for 8-bit clean memcmp" >&5
-+echo "configure:105724: checking for 8-bit clean memcmp" >&5
++echo "configure:106066: checking for 8-bit clean memcmp" >&5
  if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -104745,7 +105728,7 @@
+@@ -104745,7 +106070,7 @@ else
    ac_cv_func_memcmp_clean=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 104749 "configure"
-+#line 105732 "configure"
++#line 106074 "configure"
  #include "confdefs.h"
  
  main()
-@@ -104755,7 +105738,7 @@
+@@ -104755,7 +106080,7 @@ main()
  }
  
  EOF
 -if { (eval echo configure:104759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:105742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:106084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_func_memcmp_clean=yes
  else
-@@ -104775,19 +105758,19 @@
+@@ -104775,19 +106100,19 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
  # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
  # for constant arguments.  Useless!
  echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
 -echo "configure:104779: checking for working alloca.h" >&5
-+echo "configure:105762: checking for working alloca.h" >&5
++echo "configure:106104: checking for working alloca.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 104784 "configure"
-+#line 105767 "configure"
++#line 106109 "configure"
  #include "confdefs.h"
  #include <alloca.h>
  int main() {
@@ -17327,355 +17679,355 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:104791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:105774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:106116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_header_alloca_h=yes
  else
-@@ -104808,12 +105791,12 @@
+@@ -104808,12 +106133,12 @@ EOF
  fi
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
 -echo "configure:104812: checking for alloca" >&5
-+echo "configure:105795: checking for alloca" >&5
++echo "configure:106137: checking for alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 104817 "configure"
-+#line 105800 "configure"
++#line 106142 "configure"
  #include "confdefs.h"
  
  #ifdef __GNUC__
-@@ -104841,7 +105824,7 @@
+@@ -104841,7 +106166,7 @@ int main() {
  char *p = (char *) alloca(1);
  ; return 0; }
  EOF
 -if { (eval echo configure:104845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:105828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:106170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_func_alloca_works=yes
  else
-@@ -104873,12 +105856,12 @@
+@@ -104873,12 +106198,12 @@ EOF
  
  
  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
 -echo "configure:104877: checking whether alloca needs Cray hooks" >&5
-+echo "configure:105860: checking whether alloca needs Cray hooks" >&5
++echo "configure:106202: checking whether alloca needs Cray hooks" >&5
  if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 104882 "configure"
-+#line 105865 "configure"
++#line 106207 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
  webecray
-@@ -104903,12 +105886,12 @@
+@@ -104903,12 +106228,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
  if test $ac_cv_os_cray = yes; then
  for ac_func in _getb67 GETB67 getb67; do
    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:104907: checking for $ac_func" >&5
-+echo "configure:105890: checking for $ac_func" >&5
++echo "configure:106232: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 104912 "configure"
-+#line 105895 "configure"
++#line 106237 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -104931,7 +105914,7 @@
+@@ -104931,7 +106256,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:104935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:105918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:106260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -104958,7 +105941,7 @@
+@@ -104958,7 +106283,7 @@ done
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
 -echo "configure:104962: checking stack direction for C alloca" >&5
-+echo "configure:105945: checking stack direction for C alloca" >&5
++echo "configure:106287: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -104966,7 +105949,7 @@
+@@ -104966,7 +106291,7 @@ else
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
 -#line 104970 "configure"
-+#line 105953 "configure"
++#line 106295 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
-@@ -104985,7 +105968,7 @@
+@@ -104985,7 +106310,7 @@ main ()
    exit (find_stack_direction() < 0);
  }
  EOF
 -if { (eval echo configure:104989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:105972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:106314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
  else
-@@ -105009,12 +105992,12 @@
+@@ -105009,12 +106334,12 @@ fi
  for ac_func in memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:105013: checking for $ac_func" >&5
-+echo "configure:105996: checking for $ac_func" >&5
++echo "configure:106338: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 105018 "configure"
-+#line 106001 "configure"
++#line 106343 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -105037,7 +106020,7 @@
+@@ -105037,7 +106362,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:105041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:106024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:106366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -105063,7 +106046,7 @@
+@@ -105063,7 +106388,7 @@ done
  
  
    echo $ac_n "checking whether sprintf is broken""... $ac_c" 1>&6
 -echo "configure:105067: checking whether sprintf is broken" >&5
-+echo "configure:106050: checking whether sprintf is broken" >&5
++echo "configure:106392: checking whether sprintf is broken" >&5
  if eval "test \"`echo '$''{'ac_cv_broken_sprintf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -105074,11 +106057,11 @@
+@@ -105074,11 +106399,11 @@ else
      
  else
    cat > conftest.$ac_ext <<EOF
 -#line 105078 "configure"
-+#line 106061 "configure"
++#line 106403 "configure"
  #include "confdefs.h"
  main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }
  EOF
 -if { (eval echo configure:105082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:106065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:106407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
        ac_cv_broken_sprintf=no
-@@ -105112,12 +106095,12 @@
+@@ -105112,12 +106437,12 @@ EOF
  for ac_func in finite isfinite isinf isnan
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:105116: checking for $ac_func" >&5
-+echo "configure:106099: checking for $ac_func" >&5
++echo "configure:106441: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 105121 "configure"
-+#line 106104 "configure"
++#line 106446 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -105140,7 +106123,7 @@
+@@ -105140,7 +106465,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:105144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:106127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:106469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -105167,13 +106150,13 @@
+@@ -105167,13 +106492,13 @@ done
  
  
    echo $ac_n "checking whether fp_except is defined""... $ac_c" 1>&6
 -echo "configure:105171: checking whether fp_except is defined" >&5
-+echo "configure:106154: checking whether fp_except is defined" >&5
++echo "configure:106496: checking whether fp_except is defined" >&5
  if eval "test \"`echo '$''{'ac_cv_type_fp_except'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    
      cat > conftest.$ac_ext <<EOF
 -#line 105177 "configure"
-+#line 106160 "configure"
++#line 106502 "configure"
  #include "confdefs.h"
  
  #include <floatingpoint.h>
-@@ -105184,7 +106167,7 @@
+@@ -105184,7 +106509,7 @@ fp_except x = (fp_except) 0;
  
  ; return 0; }
  EOF
 -if { (eval echo configure:105188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:106171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:106513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
       ac_cv_type_fp_except=yes
-@@ -105211,9 +106194,9 @@
+@@ -105211,9 +106536,9 @@ EOF
  
  
    echo $ac_n "checking for usable _FPU_SETCW""... $ac_c" 1>&6
 -echo "configure:105215: checking for usable _FPU_SETCW" >&5
-+echo "configure:106198: checking for usable _FPU_SETCW" >&5
++echo "configure:106540: checking for usable _FPU_SETCW" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 105217 "configure"
-+#line 106200 "configure"
++#line 106542 "configure"
  #include "confdefs.h"
  
      #include <fpu_control.h>
-@@ -105233,7 +106216,7 @@
+@@ -105233,7 +106558,7 @@ int main() {
    
  ; return 0; }
  EOF
 -if { (eval echo configure:105237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:106220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:106562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cfp_have__fpu_setcw=yes
  else
-@@ -105254,9 +106237,9 @@
+@@ -105254,9 +106579,9 @@ EOF
    fi
    
    echo $ac_n "checking for usable fpsetprec""... $ac_c" 1>&6
 -echo "configure:105258: checking for usable fpsetprec" >&5
-+echo "configure:106241: checking for usable fpsetprec" >&5
++echo "configure:106583: checking for usable fpsetprec" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 105260 "configure"
-+#line 106243 "configure"
++#line 106585 "configure"
  #include "confdefs.h"
  
      #include <machine/ieeefp.h>
-@@ -105275,7 +106258,7 @@
+@@ -105275,7 +106600,7 @@ int main() {
    
  ; return 0; }
  EOF
 -if { (eval echo configure:105279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:106262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:106604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cfp_have_fpsetprec=yes
  else
-@@ -105296,9 +106279,9 @@
+@@ -105296,9 +106621,9 @@ EOF
    fi
  
    echo $ac_n "checking for usable _controlfp""... $ac_c" 1>&6
 -echo "configure:105300: checking for usable _controlfp" >&5
-+echo "configure:106283: checking for usable _controlfp" >&5
++echo "configure:106625: checking for usable _controlfp" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 105302 "configure"
-+#line 106285 "configure"
++#line 106627 "configure"
  #include "confdefs.h"
  
      #include <float.h>
-@@ -105317,7 +106300,7 @@
+@@ -105317,7 +106642,7 @@ int main() {
    
  ; return 0; }
  EOF
 -if { (eval echo configure:105321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:106304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:106646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cfp_have__controlfp=yes
  else
-@@ -105338,9 +106321,9 @@
+@@ -105338,9 +106663,9 @@ EOF
    fi
  
    echo $ac_n "checking for usable _controlfp_s""... $ac_c" 1>&6
 -echo "configure:105342: checking for usable _controlfp_s" >&5
-+echo "configure:106325: checking for usable _controlfp_s" >&5
++echo "configure:106667: checking for usable _controlfp_s" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 105344 "configure"
-+#line 106327 "configure"
++#line 106669 "configure"
  #include "confdefs.h"
  
     #include <float.h>
-@@ -105360,7 +106343,7 @@
+@@ -105360,7 +106685,7 @@ int main() {
    
  ; return 0; }
  EOF
 -if { (eval echo configure:105364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:106347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:106689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cfp_have__controlfp_s=yes
  else
-@@ -105381,9 +106364,9 @@
+@@ -105381,9 +106706,9 @@ EOF
    fi
  
    echo $ac_n "checking whether FPU control word can be manipulated by inline assembler""... $ac_c" 1>&6
 -echo "configure:105385: checking whether FPU control word can be manipulated by inline assembler" >&5
-+echo "configure:106368: checking whether FPU control word can be manipulated by inline assembler" >&5
++echo "configure:106710: checking whether FPU control word can be manipulated by inline assembler" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 105387 "configure"
-+#line 106370 "configure"
++#line 106712 "configure"
  #include "confdefs.h"
  
      /* nothing */
-@@ -105405,7 +106388,7 @@
+@@ -105405,7 +106730,7 @@ int main() {
    
  ; return 0; }
  EOF
 -if { (eval echo configure:105409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:106392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:106734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cfp_have_fpu_inline_asm_x86=yes
  else
-@@ -105427,7 +106410,7 @@
+@@ -105427,7 +106752,7 @@ EOF
  
  
  echo $ac_n "checking whether double cast to long preserves least significant bits""... $ac_c" 1>&6
 -echo "configure:105431: checking whether double cast to long preserves least significant bits" >&5
-+echo "configure:106414: checking whether double cast to long preserves least significant bits" >&5
++echo "configure:106756: checking whether double cast to long preserves least significant bits" >&5
  
  if test "$cross_compiling" = yes; then
    
-@@ -105435,7 +106418,7 @@
+@@ -105435,7 +106760,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 105439 "configure"
-+#line 106422 "configure"
++#line 106764 "configure"
  #include "confdefs.h"
  
  #include <limits.h>
-@@ -105459,7 +106442,7 @@
+@@ -105459,7 +106784,7 @@ int main()
  }
  
  EOF
 -if { (eval echo configure:105463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:106446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:106788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    cat >> confdefs.h <<\EOF
-@@ -105485,17 +106468,17 @@
+@@ -105485,17 +106810,17 @@ for ac_hdr in dlfcn.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:105489: checking for $ac_hdr" >&5
-+echo "configure:106472: checking for $ac_hdr" >&5
++echo "configure:106814: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 105494 "configure"
-+#line 106477 "configure"
++#line 106819 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:105499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:106482: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:106824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -105523,14 +106506,14 @@
+@@ -105523,14 +106848,14 @@ done
  
  
  echo $ac_n "checking whether dlsym() requires a leading underscore in symbol names""... $ac_c" 1>&6
 -echo "configure:105527: checking whether dlsym() requires a leading underscore in symbol names" >&5
-+echo "configure:106510: checking whether dlsym() requires a leading underscore in symbol names" >&5
++echo "configure:106852: checking whether dlsym() requires a leading underscore in symbol names" >&5
  if test "$cross_compiling" = yes; then :
    
  else
@@ -17683,54 +18035,54 @@
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 105534 "configure"
-+#line 106517 "configure"
++#line 106859 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -105593,7 +106576,7 @@
+@@ -105593,7 +106918,7 @@ int main ()
      exit (status);
  }
  EOF
 -  if { (eval echo configure:105597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+  if { (eval echo configure:106580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
++  if { (eval echo configure:106922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
      case x$lt_status in
-@@ -105676,23 +106659,23 @@
+@@ -105676,23 +107001,23 @@ fi
  
  
  echo $ac_n "checking virtual machine dispatch method""... $ac_c" 1>&6
 -echo "configure:105680: checking virtual machine dispatch method" >&5
-+echo "configure:106663: checking virtual machine dispatch method" >&5
++echo "configure:107005: checking virtual machine dispatch method" >&5
  echo "$ac_t""$PHP_ZEND_VM" 1>&6
  
  echo $ac_n "checking whether to enable thread-safety""... $ac_c" 1>&6
 -echo "configure:105684: checking whether to enable thread-safety" >&5
-+echo "configure:106667: checking whether to enable thread-safety" >&5
++echo "configure:107009: checking whether to enable thread-safety" >&5
  echo "$ac_t""$ZEND_MAINTAINER_ZTS" 1>&6
  
  echo $ac_n "checking whether to enable inline optimization for GCC""... $ac_c" 1>&6
 -echo "configure:105688: checking whether to enable inline optimization for GCC" >&5
-+echo "configure:106671: checking whether to enable inline optimization for GCC" >&5
++echo "configure:107013: checking whether to enable inline optimization for GCC" >&5
  echo "$ac_t""$ZEND_INLINE_OPTIMIZATION" 1>&6
  
  echo $ac_n "checking whether to enable Zend debugging""... $ac_c" 1>&6
 -echo "configure:105692: checking whether to enable Zend debugging" >&5
-+echo "configure:106675: checking whether to enable Zend debugging" >&5
++echo "configure:107017: checking whether to enable Zend debugging" >&5
  echo "$ac_t""$ZEND_DEBUG" 1>&6
  
  echo $ac_n "checking whether to enable Zend multibyte""... $ac_c" 1>&6
 -echo "configure:105696: checking whether to enable Zend multibyte" >&5
-+echo "configure:106679: checking whether to enable Zend multibyte" >&5
++echo "configure:107021: checking whether to enable Zend multibyte" >&5
  echo "$ac_t""$ZEND_MULTIBYTE" 1>&6
  
  case $PHP_ZEND_VM in
-@@ -105765,21 +106748,21 @@
+@@ -105765,21 +107090,21 @@ fi
  
  
  echo $ac_n "checking for inline""... $ac_c" 1>&6
 -echo "configure:105769: checking for inline" >&5
-+echo "configure:106752: checking for inline" >&5
++echo "configure:107094: checking for inline" >&5
  if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -17738,7 +18090,7 @@
  for ac_kw in inline __inline__ __inline; do
    cat > conftest.$ac_ext <<EOF
 -#line 105776 "configure"
-+#line 106759 "configure"
++#line 107101 "configure"
  #include "confdefs.h"
  
  int main() {
@@ -17746,363 +18098,363 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:105783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:106766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:107108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_inline=$ac_kw; break
  else
-@@ -105808,7 +106791,7 @@
+@@ -105808,7 +107133,7 @@ esac
  
  
  echo $ac_n "checking target system is Darwin""... $ac_c" 1>&6
 -echo "configure:105812: checking target system is Darwin" >&5
-+echo "configure:106795: checking target system is Darwin" >&5
++echo "configure:107137: checking target system is Darwin" >&5
  if echo "$target" | grep "darwin" > /dev/null; then
    cat >> confdefs.h <<\EOF
  #define DARWIN 1
-@@ -105820,7 +106803,7 @@
+@@ -105820,7 +107145,7 @@ else
  fi
  
  echo $ac_n "checking for MM alignment and log values""... $ac_c" 1>&6
 -echo "configure:105824: checking for MM alignment and log values" >&5
-+echo "configure:106807: checking for MM alignment and log values" >&5
++echo "configure:107149: checking for MM alignment and log values" >&5
  
  if test "$cross_compiling" = yes; then
    
-@@ -105828,7 +106811,7 @@
+@@ -105828,7 +107153,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 105832 "configure"
-+#line 106815 "configure"
++#line 107157 "configure"
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -105864,7 +106847,7 @@
+@@ -105864,7 +107189,7 @@ int main()
  }
  
  EOF
 -if { (eval echo configure:105868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:106851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:107193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1`
-@@ -105889,7 +106872,7 @@
+@@ -105889,7 +107214,7 @@ fi
  echo "$ac_t""done" 1>&6
  
  echo $ac_n "checking for memory allocation using mmap(MAP_ANON)""... $ac_c" 1>&6
 -echo "configure:105893: checking for memory allocation using mmap(MAP_ANON)" >&5
-+echo "configure:106876: checking for memory allocation using mmap(MAP_ANON)" >&5
++echo "configure:107218: checking for memory allocation using mmap(MAP_ANON)" >&5
  
  if test "$cross_compiling" = yes; then
    
-@@ -105897,7 +106880,7 @@
+@@ -105897,7 +107222,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 105901 "configure"
-+#line 106884 "configure"
++#line 107226 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -105933,7 +106916,7 @@
+@@ -105933,7 +107258,7 @@ int main()
  }
  
  EOF
 -if { (eval echo configure:105937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:106920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:107262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    cat >> confdefs.h <<\EOF
-@@ -105955,7 +106938,7 @@
+@@ -105955,7 +107280,7 @@ fi
  
  
  echo $ac_n "checking for memory allocation using mmap("/dev/zero")""... $ac_c" 1>&6
 -echo "configure:105959: checking for memory allocation using mmap("/dev/zero")" >&5
-+echo "configure:106942: checking for memory allocation using mmap("/dev/zero")" >&5
++echo "configure:107284: checking for memory allocation using mmap("/dev/zero")" >&5
  
  if test "$cross_compiling" = yes; then
    
-@@ -105963,7 +106946,7 @@
+@@ -105963,7 +107288,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 105967 "configure"
-+#line 106950 "configure"
++#line 107292 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -106009,7 +106992,7 @@
+@@ -106009,7 +107334,7 @@ int main()
  }
  
  EOF
 -if { (eval echo configure:106013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:106996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:107338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    cat >> confdefs.h <<\EOF
-@@ -106033,12 +107016,12 @@
+@@ -106033,12 +107358,12 @@ fi
  for ac_func in mremap
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:106037: checking for $ac_func" >&5
-+echo "configure:107020: checking for $ac_func" >&5
++echo "configure:107362: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 106042 "configure"
-+#line 107025 "configure"
++#line 107367 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -106061,7 +107044,7 @@
+@@ -106061,7 +107386,7 @@ $ac_func();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:106065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:107048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:107390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -106128,17 +107111,17 @@
+@@ -106128,17 +107453,17 @@ for ac_hdr in stdarg.h
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:106132: checking for $ac_hdr" >&5
-+echo "configure:107115: checking for $ac_hdr" >&5
++echo "configure:107457: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 106137 "configure"
-+#line 107120 "configure"
++#line 107462 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:106142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:107125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:107467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -106215,7 +107198,7 @@
+@@ -106215,7 +107540,7 @@ if test "$TSRM_PTH" != "no"; then
    
  
  echo $ac_n "checking for GNU Pth""... $ac_c" 1>&6
 -echo "configure:106219: checking for GNU Pth" >&5
-+echo "configure:107202: checking for GNU Pth" >&5
++echo "configure:107544: checking for GNU Pth" >&5
  PTH_PREFIX="`$TSRM_PTH --prefix`"
  if test -z "$PTH_PREFIX"; then
    echo "$ac_t""Please check your Pth installation" 1>&6
-@@ -106245,17 +107228,17 @@
+@@ -106245,17 +107570,17 @@ elif test "$TSRM_ST" != "no"; then
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:106249: checking for $ac_hdr" >&5
-+echo "configure:107232: checking for $ac_hdr" >&5
++echo "configure:107574: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 106254 "configure"
-+#line 107237 "configure"
++#line 107579 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:106259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:107242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:107584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -106285,7 +107268,7 @@
+@@ -106285,7 +107610,7 @@ done
  
    LIBS="$LIBS -lst"
    echo $ac_n "checking for SGI's State Threads""... $ac_c" 1>&6
 -echo "configure:106289: checking for SGI's State Threads" >&5
-+echo "configure:107272: checking for SGI's State Threads" >&5
++echo "configure:107614: checking for SGI's State Threads" >&5
    echo "$ac_t""yes" 1>&6
    cat >> confdefs.h <<\EOF
  #define TSRM_ST 1
-@@ -106324,7 +107307,7 @@
+@@ -106324,7 +107649,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 106328 "configure"
-+#line 107311 "configure"
++#line 107653 "configure"
  #include "confdefs.h"
  
  #include <pthread.h>
-@@ -106342,7 +107325,7 @@
+@@ -106342,7 +107667,7 @@ int main() {
      return pthread_create(&thd, NULL, thread_routine, &data);
  } 
  EOF
 -if { (eval echo configure:106346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:107329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:107671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    pthreads_working=yes
-@@ -106362,7 +107345,7 @@
+@@ -106362,7 +107687,7 @@ fi
    CFLAGS=$save_CFLAGS
  
    echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6
 -echo "configure:106366: checking for pthreads_cflags" >&5
-+echo "configure:107349: checking for pthreads_cflags" >&5
++echo "configure:107691: checking for pthreads_cflags" >&5
  if eval "test \"`echo '$''{'ac_cv_pthreads_cflags'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -106384,7 +107367,7 @@
+@@ -106384,7 +107709,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 106388 "configure"
-+#line 107371 "configure"
++#line 107713 "configure"
  #include "confdefs.h"
  
  #include <pthread.h>
-@@ -106402,7 +107385,7 @@
+@@ -106402,7 +107727,7 @@ int main() {
      return pthread_create(&thd, NULL, thread_routine, &data);
  } 
  EOF
 -if { (eval echo configure:106406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:107389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:107731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    pthreads_working=yes
-@@ -106432,7 +107415,7 @@
+@@ -106432,7 +107757,7 @@ fi
  echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6
  
  echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6
 -echo "configure:106436: checking for pthreads_lib" >&5
-+echo "configure:107419: checking for pthreads_lib" >&5
++echo "configure:107761: checking for pthreads_lib" >&5
  if eval "test \"`echo '$''{'ac_cv_pthreads_lib'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -106454,7 +107437,7 @@
+@@ -106454,7 +107779,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 106458 "configure"
-+#line 107441 "configure"
++#line 107783 "configure"
  #include "confdefs.h"
  
  #include <pthread.h>
-@@ -106472,7 +107455,7 @@
+@@ -106472,7 +107797,7 @@ int main() {
      return pthread_create(&thd, NULL, thread_routine, &data);
  } 
  EOF
 -if { (eval echo configure:106476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:107459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:107801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    
    pthreads_working=yes
-@@ -106523,7 +107506,7 @@
+@@ -106523,7 +107848,7 @@ EOF
  
  
    echo $ac_n "checking for POSIX threads""... $ac_c" 1>&6
 -echo "configure:106527: checking for POSIX threads" >&5
-+echo "configure:107510: checking for POSIX threads" >&5
++echo "configure:107852: checking for POSIX threads" >&5
    echo "$ac_t""yes" 1>&6
  fi
  
-@@ -107157,7 +108140,7 @@
+@@ -107157,7 +108482,7 @@ fi
  
  
  echo $ac_n "checking build system type""... $ac_c" 1>&6
 -echo "configure:107161: checking build system type" >&5
-+echo "configure:108144: checking build system type" >&5
++echo "configure:108486: checking build system type" >&5
  
  build_alias=$build
  case "$build_alias" in
-@@ -107186,7 +108169,7 @@
+@@ -107186,7 +108511,7 @@ ac_prog=ld
  if test "$GCC" = yes; then
    # Check if gcc -print-prog-name=ld gives a path.
    echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6
 -echo "configure:107190: checking for ld used by $CC" >&5
-+echo "configure:108173: checking for ld used by $CC" >&5
++echo "configure:108515: checking for ld used by $CC" >&5
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -107216,10 +108199,10 @@
+@@ -107216,10 +108541,10 @@ echo "configure:107190: checking for ld used by $CC" >&5
    esac
  elif test "$with_gnu_ld" = yes; then
    echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
 -echo "configure:107220: checking for GNU ld" >&5
-+echo "configure:108203: checking for GNU ld" >&5
++echo "configure:108545: checking for GNU ld" >&5
  else
    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
 -echo "configure:107223: checking for non-GNU ld" >&5
-+echo "configure:108206: checking for non-GNU ld" >&5
++echo "configure:108548: checking for non-GNU ld" >&5
  fi
  if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -107258,7 +108241,7 @@
+@@ -107258,7 +108583,7 @@ else
  fi
  test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
  echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
 -echo "configure:107262: checking if the linker ($LD) is GNU ld" >&5
-+echo "configure:108245: checking if the linker ($LD) is GNU ld" >&5
++echo "configure:108587: checking if the linker ($LD) is GNU ld" >&5
  if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -107278,7 +108261,7 @@
+@@ -107278,7 +108603,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
  
  
  echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
 -echo "configure:107282: checking for $LD option to reload object files" >&5
-+echo "configure:108265: checking for $LD option to reload object files" >&5
++echo "configure:108607: checking for $LD option to reload object files" >&5
  if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -107303,7 +108286,7 @@
+@@ -107303,7 +108628,7 @@ case $host_os in
  esac
  
  echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
 -echo "configure:107307: checking for BSD-compatible nm" >&5
-+echo "configure:108290: checking for BSD-compatible nm" >&5
++echo "configure:108632: checking for BSD-compatible nm" >&5
  if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -107356,7 +108339,7 @@
+@@ -107356,7 +108681,7 @@ echo "$ac_t""$lt_cv_path_NM" 1>&6
  NM="$lt_cv_path_NM"
  
  echo $ac_n "checking how to recognize dependent libraries""... $ac_c" 1>&6
 -echo "configure:107360: checking how to recognize dependent libraries" >&5
-+echo "configure:108343: checking how to recognize dependent libraries" >&5
++echo "configure:108685: checking how to recognize dependent libraries" >&5
  if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -107548,13 +108531,13 @@
+@@ -107548,13 +108873,13 @@ deplibs_check_method=$lt_cv_deplibs_check_method
  test -z "$deplibs_check_method" && deplibs_check_method=unknown
  
  echo $ac_n "checking for object suffix""... $ac_c" 1>&6
 -echo "configure:107552: checking for object suffix" >&5
-+echo "configure:108535: checking for object suffix" >&5
++echo "configure:108877: checking for object suffix" >&5
  if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    rm -f conftest*
  echo 'int i = 1;' > conftest.$ac_ext
 -if { (eval echo configure:107558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:108541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:108883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    for ac_file in conftest.*; do
      case $ac_file in
      *.c) ;;
-@@ -107574,7 +108557,7 @@
+@@ -107574,7 +108899,7 @@ ac_objext=$ac_cv_objext
  
  
  echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
 -echo "configure:107578: checking for executable suffix" >&5
-+echo "configure:108561: checking for executable suffix" >&5
++echo "configure:108903: checking for executable suffix" >&5
  if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -107584,10 +108567,10 @@
+@@ -107584,10 +108909,10 @@ else
    rm -f conftest*
    echo 'int main () { return 0; }' > conftest.$ac_ext
    ac_cv_exeext=
 -  if { (eval echo configure:107588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-+  if { (eval echo configure:108571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++  if { (eval echo configure:108913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
      for file in conftest.*; do
        case $file in
 -      *.c | *.o | *.obj) ;;
@@ -18110,50 +18462,50 @@
        *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
        esac
      done
-@@ -107630,7 +108613,7 @@
+@@ -107630,7 +108955,7 @@ case $host in
  ia64-*-hpux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
 -  if { (eval echo configure:107634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  if { (eval echo configure:108617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  if { (eval echo configure:108959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
      case `/usr/bin/file conftest.$ac_objext` in
      *ELF-32*)
        HPUX_IA64_MODE="32"
-@@ -107644,8 +108627,8 @@
+@@ -107644,8 +108969,8 @@ ia64-*-hpux*)
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
 -  echo '#line 107648 "configure"' > conftest.$ac_ext
 -  if { (eval echo configure:107649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  echo '#line 108631 "configure"' > conftest.$ac_ext
-+  if { (eval echo configure:108632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  echo '#line 108973 "configure"' > conftest.$ac_ext
++  if { (eval echo configure:108974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     if test "$lt_cv_prog_gnu_ld" = yes; then
      case `/usr/bin/file conftest.$ac_objext` in
      *32-bit*)
-@@ -107679,7 +108662,7 @@
+@@ -107679,7 +109004,7 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
  s390*-*linux*|sparc*-*linux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
 -  if { (eval echo configure:107683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  if { (eval echo configure:108666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  if { (eval echo configure:109008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
      case `/usr/bin/file conftest.o` in
      *32-bit*)
        case $host in
-@@ -107729,7 +108712,7 @@
+@@ -107729,7 +109054,7 @@ s390*-*linux*|sparc*-*linux*)
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
    echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
 -echo "configure:107733: checking whether the C compiler needs -belf" >&5
-+echo "configure:108716: checking whether the C compiler needs -belf" >&5
++echo "configure:109058: checking whether the C compiler needs -belf" >&5
  if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -107742,14 +108725,14 @@
+@@ -107742,14 +109067,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
  cross_compiling=$ac_cv_prog_cc_cross
  
       cat > conftest.$ac_ext <<EOF
 -#line 107746 "configure"
-+#line 108729 "configure"
++#line 109071 "configure"
  #include "confdefs.h"
  
  int main() {
@@ -18161,877 +18513,877 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:107753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:108736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:109078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    lt_cv_cc_needs_belf=yes
  else
-@@ -107777,7 +108760,7 @@
+@@ -107777,7 +109102,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
  sparc*-*solaris*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
 -  if { (eval echo configure:107781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  if { (eval echo configure:108764: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  if { (eval echo configure:109106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
      case `/usr/bin/file conftest.o` in
      *64-bit*)
        case $lt_cv_prog_gnu_ld in
-@@ -107806,7 +108789,7 @@
+@@ -107806,7 +109131,7 @@ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
      ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
      (test "X$CXX" != "Xg++"))) ; then
    echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
 -echo "configure:107810: checking how to run the C++ preprocessor" >&5
-+echo "configure:108793: checking how to run the C++ preprocessor" >&5
++echo "configure:109135: checking how to run the C++ preprocessor" >&5
  if test -z "$CXXCPP"; then
  if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -107819,12 +108802,12 @@
+@@ -107819,12 +109144,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
  cross_compiling=$ac_cv_prog_cxx_cross
    CXXCPP="${CXX-g++} -E"
    cat > conftest.$ac_ext <<EOF
 -#line 107823 "configure"
-+#line 108806 "configure"
++#line 109148 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:107828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:108811: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:109153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
-@@ -107854,7 +108837,7 @@
+@@ -107854,7 +109179,7 @@ fi
  # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
  # find the maximum length of command line arguments
  echo $ac_n "checking the maximum length of command line arguments""... $ac_c" 1>&6
 -echo "configure:107858: checking the maximum length of command line arguments" >&5
-+echo "configure:108841: checking the maximum length of command line arguments" >&5
++echo "configure:109183: checking the maximum length of command line arguments" >&5
  if eval "test \"`echo '$''{'lt_cv_sys_max_cmd_len'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -107976,7 +108959,7 @@
+@@ -107976,7 +109301,7 @@ fi
  
  # Check for command to grab the raw symbol name followed by C symbol from nm.
  echo $ac_n "checking command to parse $NM output from $compiler object""... $ac_c" 1>&6
 -echo "configure:107980: checking command to parse $NM output from $compiler object" >&5
-+echo "configure:108963: checking command to parse $NM output from $compiler object" >&5
++echo "configure:109305: checking command to parse $NM output from $compiler object" >&5
  if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -108080,10 +109063,10 @@
+@@ -108080,10 +109405,10 @@ void nm_test_func(){}
  int main(){nm_test_var='a';nm_test_func();return(0);}
  EOF
  
 -  if { (eval echo configure:108084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  if { (eval echo configure:109067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  if { (eval echo configure:109409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
      # Now try to grab the symbols.
      nlist=conftest.nm
 -    if { (eval echo configure:108087: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
-+    if { (eval echo configure:109070: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
++    if { (eval echo configure:109412: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
        # Try sorting and uniquifying the output.
        if sort "$nlist" | uniq > "$nlist"T; then
        mv -f "$nlist"T "$nlist"
-@@ -108134,7 +109117,7 @@
+@@ -108134,7 +109459,7 @@ EOF
          lt_save_CFLAGS="$CFLAGS"
          LIBS="conftstm.$ac_objext"
          CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
 -        if { (eval echo configure:108138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+        if { (eval echo configure:109121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++        if { (eval echo configure:109463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
            pipe_works=yes
          fi
          LIBS="$lt_save_LIBS"
-@@ -108174,7 +109157,7 @@
+@@ -108174,7 +109499,7 @@ else
  fi
  
  echo $ac_n "checking for objdir""... $ac_c" 1>&6
 -echo "configure:108178: checking for objdir" >&5
-+echo "configure:109161: checking for objdir" >&5
++echo "configure:109503: checking for objdir" >&5
  if eval "test \"`echo '$''{'lt_cv_objdir'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -108240,7 +109223,7 @@
+@@ -108240,7 +109565,7 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"
  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ar; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:108244: checking for $ac_word" >&5
-+echo "configure:109227: checking for $ac_word" >&5
++echo "configure:109569: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -108272,7 +109255,7 @@
+@@ -108272,7 +109597,7 @@ if test -n "$ac_tool_prefix"; then
    # Extract the first word of "ar", so it can be a program name with args.
  set dummy ar; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:108276: checking for $ac_word" >&5
-+echo "configure:109259: checking for $ac_word" >&5
++echo "configure:109601: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -108307,7 +109290,7 @@
+@@ -108307,7 +109632,7 @@ fi
  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:108311: checking for $ac_word" >&5
-+echo "configure:109294: checking for $ac_word" >&5
++echo "configure:109636: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -108339,7 +109322,7 @@
+@@ -108339,7 +109664,7 @@ if test -n "$ac_tool_prefix"; then
    # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:108343: checking for $ac_word" >&5
-+echo "configure:109326: checking for $ac_word" >&5
++echo "configure:109668: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -108374,7 +109357,7 @@
+@@ -108374,7 +109699,7 @@ fi
  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:108378: checking for $ac_word" >&5
-+echo "configure:109361: checking for $ac_word" >&5
++echo "configure:109703: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -108406,7 +109389,7 @@
+@@ -108406,7 +109731,7 @@ if test -n "$ac_tool_prefix"; then
    # Extract the first word of "strip", so it can be a program name with args.
  set dummy strip; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:108410: checking for $ac_word" >&5
-+echo "configure:109393: checking for $ac_word" >&5
++echo "configure:109735: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -108493,7 +109476,7 @@
+@@ -108493,7 +109818,7 @@ case $deplibs_check_method in
  file_magic*)
    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
      echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
 -echo "configure:108497: checking for ${ac_tool_prefix}file" >&5
-+echo "configure:109480: checking for ${ac_tool_prefix}file" >&5
++echo "configure:109822: checking for ${ac_tool_prefix}file" >&5
  if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -108553,7 +109536,7 @@
+@@ -108553,7 +109878,7 @@ fi
  if test -z "$lt_cv_path_MAGIC_CMD"; then
    if test -n "$ac_tool_prefix"; then
      echo $ac_n "checking for file""... $ac_c" 1>&6
 -echo "configure:108557: checking for file" >&5
-+echo "configure:109540: checking for file" >&5
++echo "configure:109882: checking for file" >&5
  if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -108625,7 +109608,7 @@
+@@ -108625,7 +109950,7 @@ esac
      # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
  set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:108629: checking for $ac_word" >&5
-+echo "configure:109612: checking for $ac_word" >&5
++echo "configure:109954: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_DSYMUTIL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -108657,7 +109640,7 @@
+@@ -108657,7 +109982,7 @@ if test -n "$ac_tool_prefix"; then
    # Extract the first word of "dsymutil", so it can be a program name with args.
  set dummy dsymutil; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:108661: checking for $ac_word" >&5
-+echo "configure:109644: checking for $ac_word" >&5
++echo "configure:109986: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_DSYMUTIL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -108692,7 +109675,7 @@
+@@ -108692,7 +110017,7 @@ fi
      # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
  set dummy ${ac_tool_prefix}nmedit; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:108696: checking for $ac_word" >&5
-+echo "configure:109679: checking for $ac_word" >&5
++echo "configure:110021: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_NMEDIT'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -108724,7 +109707,7 @@
+@@ -108724,7 +110049,7 @@ if test -n "$ac_tool_prefix"; then
    # Extract the first word of "nmedit", so it can be a program name with args.
  set dummy nmedit; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:108728: checking for $ac_word" >&5
-+echo "configure:109711: checking for $ac_word" >&5
++echo "configure:110053: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_NMEDIT'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -108758,7 +109741,7 @@
+@@ -108758,7 +110083,7 @@ fi
  
  
      echo $ac_n "checking for -single_module linker flag""... $ac_c" 1>&6
 -echo "configure:108762: checking for -single_module linker flag" >&5
-+echo "configure:109745: checking for -single_module linker flag" >&5
++echo "configure:110087: checking for -single_module linker flag" >&5
  if eval "test \"`echo '$''{'lt_cv_apple_cc_single_mod'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -108781,7 +109764,7 @@
+@@ -108781,7 +110106,7 @@ fi
  
  echo "$ac_t""$lt_cv_apple_cc_single_mod" 1>&6
      echo $ac_n "checking for -exported_symbols_list linker flag""... $ac_c" 1>&6
 -echo "configure:108785: checking for -exported_symbols_list linker flag" >&5
-+echo "configure:109768: checking for -exported_symbols_list linker flag" >&5
++echo "configure:110110: checking for -exported_symbols_list linker flag" >&5
  if eval "test \"`echo '$''{'lt_cv_ld_exported_symbols_list'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -108791,12 +109774,12 @@
+@@ -108791,12 +110116,12 @@ else
        LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
        
  cat > conftest.$ac_ext <<EOF
 -#line 108795 "configure"
-+#line 109778 "configure"
++#line 110120 "configure"
  #include "confdefs.h"
  int main() {
  ; return 0; }
  EOF
 -if { (eval echo configure:108800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:109783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:110125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   lt_cv_ld_exported_symbols_list=yes
    rm -rf conftest*
  else
-@@ -108930,7 +109913,7 @@
+@@ -108930,7 +110255,7 @@ if test "$GCC" = yes; then
  
    
  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
 -echo "configure:108934: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+echo "configure:109917: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo "configure:110259: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
  if eval "test \"`echo '$''{'lt_cv_prog_compiler_rtti_exceptions'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -108947,11 +109930,11 @@
+@@ -108947,11 +110272,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"configure:108951: $lt_compile\"" >&5)
-+   (eval echo "\"configure:109934: $lt_compile\"" >&5)
++   (eval echo "\"configure:110276: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "configure:108955: \$? = $ac_status" >&5
-+   echo "configure:109938: \$? = $ac_status" >&5
++   echo "configure:110280: \$? = $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.
-@@ -108980,7 +109963,7 @@
+@@ -108980,7 +110305,7 @@ lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
  echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
 -echo "configure:108984: checking for $compiler option to produce PIC" >&5
-+echo "configure:109967: checking for $compiler option to produce PIC" >&5
++echo "configure:110309: checking for $compiler option to produce PIC" >&5
   
    if test "$GCC" = yes; then
      lt_prog_compiler_wl='-Wl,'
-@@ -109227,7 +110210,7 @@
+@@ -109227,7 +110552,7 @@ echo "$ac_t""$lt_prog_compiler_pic" 1>&6
  if test -n "$lt_prog_compiler_pic"; then
    
  echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic works""... $ac_c" 1>&6
 -echo "configure:109231: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-+echo "configure:110214: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
++echo "configure:110556: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
  if eval "test \"`echo '$''{'lt_cv_prog_compiler_pic_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -109244,11 +110227,11 @@
+@@ -109244,11 +110569,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"configure:109248: $lt_compile\"" >&5)
-+   (eval echo "\"configure:110231: $lt_compile\"" >&5)
++   (eval echo "\"configure:110573: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "configure:109252: \$? = $ac_status" >&5
-+   echo "configure:110235: \$? = $ac_status" >&5
++   echo "configure:110577: \$? = $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.
-@@ -109290,7 +110273,7 @@
+@@ -109290,7 +110615,7 @@ esac
  #
  wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
  echo $ac_n "checking if $compiler static flag $lt_tmp_static_flag works""... $ac_c" 1>&6
 -echo "configure:109294: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo "configure:110277: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo "configure:110619: checking if $compiler static flag $lt_tmp_static_flag works" >&5
  if eval "test \"`echo '$''{'lt_cv_prog_compiler_static_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -109328,7 +110311,7 @@
+@@ -109328,7 +110653,7 @@ fi
  
  
  echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
 -echo "configure:109332: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo "configure:110315: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo "configure:110657: checking if $compiler supports -c -o file.$ac_objext" >&5
  if eval "test \"`echo '$''{'lt_cv_prog_compiler_c_o'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -109348,11 +110331,11 @@
+@@ -109348,11 +110673,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"configure:109352: $lt_compile\"" >&5)
-+   (eval echo "\"configure:110335: $lt_compile\"" >&5)
++   (eval echo "\"configure:110677: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "configure:109356: \$? = $ac_status" >&5
-+   echo "configure:110339: \$? = $ac_status" >&5
++   echo "configure:110681: \$? = $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
-@@ -109382,7 +110365,7 @@
+@@ -109382,7 +110707,7 @@ hard_links="nottested"
  if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
    # do not overwrite the value of need_locks provided by the user
    echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
 -echo "configure:109386: checking if we can lock with hard links" >&5
-+echo "configure:110369: checking if we can lock with hard links" >&5
++echo "configure:110711: checking if we can lock with hard links" >&5
    hard_links=yes
    $rm conftest*
    ln conftest.a conftest.b 2>/dev/null && hard_links=no
-@@ -109399,7 +110382,7 @@
+@@ -109399,7 +110724,7 @@ else
  fi
  
  echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6
 -echo "configure:109403: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo "configure:110386: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo "configure:110728: checking whether the $compiler linker ($LD) supports shared libraries" >&5
  
    runpath_var=
    allow_undefined_flag=
-@@ -109810,12 +110793,12 @@
+@@ -109810,12 +111135,12 @@ _LT_EOF
         # Determine the default libpath from the value encoded in an empty executable.
         
  cat > conftest.$ac_ext <<EOF
 -#line 109814 "configure"
-+#line 110797 "configure"
++#line 111139 "configure"
  #include "confdefs.h"
  int main() {
  ; return 0; }
  EOF
 -if { (eval echo configure:109819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:110802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:111144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -109848,12 +110831,12 @@
+@@ -109848,12 +111173,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
         # Determine the default libpath from the value encoded in an empty executable.
         
  cat > conftest.$ac_ext <<EOF
 -#line 109852 "configure"
-+#line 110835 "configure"
++#line 111177 "configure"
  #include "confdefs.h"
  int main() {
  ; return 0; }
  EOF
 -if { (eval echo configure:109857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:110840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:111182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -110343,11 +111326,11 @@
+@@ -110343,11 +111668,11 @@ x|xyes)
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
        echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
 -echo "configure:110347: checking whether -lc should be explicitly linked in" >&5
-+echo "configure:111330: checking whether -lc should be explicitly linked in" >&5
++echo "configure:111672: checking whether -lc should be explicitly linked in" >&5
        $rm conftest*
        echo "$lt_simple_compile_test_code" > conftest.$ac_ext
  
 -      if { (eval echo configure:110351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
-+      if { (eval echo configure:111334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
++      if { (eval echo configure:111676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
          soname=conftest
          lib=conftest
          libobjs=conftest.$ac_objext
-@@ -110361,7 +111344,7 @@
+@@ -110361,7 +111686,7 @@ echo "configure:110347: checking whether -lc should be explicitly linked in" >&5
          libname=conftest
          lt_save_allow_undefined_flag=$allow_undefined_flag
          allow_undefined_flag=
 -        if { (eval echo configure:110365: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
-+        if { (eval echo configure:111348: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
++        if { (eval echo configure:111690: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
          then
          archive_cmds_need_lc=no
          else
-@@ -110380,7 +111363,7 @@
+@@ -110380,7 +111705,7 @@ echo "configure:110347: checking whether -lc should be explicitly linked in" >&5
  esac
  
  echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
 -echo "configure:110384: checking dynamic linker characteristics" >&5
-+echo "configure:111367: checking dynamic linker characteristics" >&5
++echo "configure:111709: checking dynamic linker characteristics" >&5
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -111005,7 +111988,7 @@
+@@ -111005,7 +112330,7 @@ if test "$GCC" = yes; then
  fi
  
  echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
 -echo "configure:111009: checking how to hardcode library paths into programs" >&5
-+echo "configure:111992: checking how to hardcode library paths into programs" >&5
++echo "configure:112334: checking how to hardcode library paths into programs" >&5
  hardcode_action=
  if test -n "$hardcode_libdir_flag_spec" || \
     test -n "$runpath_var" || \
-@@ -111043,7 +112026,7 @@
+@@ -111043,7 +112368,7 @@ fi
  striplib=
  old_striplib=
  echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
 -echo "configure:111047: checking whether stripping libraries is possible" >&5
-+echo "configure:112030: checking whether stripping libraries is possible" >&5
++echo "configure:112372: checking whether stripping libraries is possible" >&5
  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"
-@@ -111094,7 +112077,7 @@
+@@ -111094,7 +112419,7 @@ else
    darwin*)
    # if libdl is installed we need to link against it
      echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
 -echo "configure:111098: checking for dlopen in -ldl" >&5
-+echo "configure:112081: checking for dlopen in -ldl" >&5
++echo "configure:112423: checking for dlopen in -ldl" >&5
  ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -111102,7 +112085,7 @@
+@@ -111102,7 +112427,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 111106 "configure"
-+#line 112089 "configure"
++#line 112431 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -111113,7 +112096,7 @@
+@@ -111113,7 +112438,7 @@ int main() {
  dlopen()
  ; return 0; }
  EOF
 -if { (eval echo configure:111117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:112100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:112442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -111142,12 +112125,12 @@
+@@ -111142,12 +112467,12 @@ fi
  
    *)
      echo $ac_n "checking for shl_load""... $ac_c" 1>&6
 -echo "configure:111146: checking for shl_load" >&5
-+echo "configure:112129: checking for shl_load" >&5
++echo "configure:112471: checking for shl_load" >&5
  if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 111151 "configure"
-+#line 112134 "configure"
++#line 112476 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char shl_load(); below.  */
-@@ -111170,7 +112153,7 @@
+@@ -111170,7 +112495,7 @@ shl_load();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:111174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:112157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:112499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_shl_load=yes"
  else
-@@ -111188,7 +112171,7 @@
+@@ -111188,7 +112513,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
 -echo "configure:111192: checking for shl_load in -ldld" >&5
-+echo "configure:112175: checking for shl_load in -ldld" >&5
++echo "configure:112517: checking for shl_load in -ldld" >&5
  ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -111196,7 +112179,7 @@
+@@ -111196,7 +112521,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ldld  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 111200 "configure"
-+#line 112183 "configure"
++#line 112525 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -111207,7 +112190,7 @@
+@@ -111207,7 +112532,7 @@ int main() {
  shl_load()
  ; return 0; }
  EOF
 -if { (eval echo configure:111211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:112194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:112536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -111226,12 +112209,12 @@
+@@ -111226,12 +112551,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for dlopen""... $ac_c" 1>&6
 -echo "configure:111230: checking for dlopen" >&5
-+echo "configure:112213: checking for dlopen" >&5
++echo "configure:112555: checking for dlopen" >&5
  if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 111235 "configure"
-+#line 112218 "configure"
++#line 112560 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char dlopen(); below.  */
-@@ -111254,7 +112237,7 @@
+@@ -111254,7 +112579,7 @@ dlopen();
  
  ; return 0; }
  EOF
 -if { (eval echo configure:111258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:112241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:112583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_dlopen=yes"
  else
-@@ -111272,7 +112255,7 @@
+@@ -111272,7 +112597,7 @@ if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
 -echo "configure:111276: checking for dlopen in -ldl" >&5
-+echo "configure:112259: checking for dlopen in -ldl" >&5
++echo "configure:112601: checking for dlopen in -ldl" >&5
  ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -111280,7 +112263,7 @@
+@@ -111280,7 +112605,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 111284 "configure"
-+#line 112267 "configure"
++#line 112609 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -111291,7 +112274,7 @@
+@@ -111291,7 +112616,7 @@ int main() {
  dlopen()
  ; return 0; }
  EOF
 -if { (eval echo configure:111295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:112278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:112620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -111310,7 +112293,7 @@
+@@ -111310,7 +112635,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
 -echo "configure:111314: checking for dlopen in -lsvld" >&5
-+echo "configure:112297: checking for dlopen in -lsvld" >&5
++echo "configure:112639: checking for dlopen in -lsvld" >&5
  ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -111318,7 +112301,7 @@
+@@ -111318,7 +112643,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsvld  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 111322 "configure"
-+#line 112305 "configure"
++#line 112647 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -111329,7 +112312,7 @@
+@@ -111329,7 +112654,7 @@ int main() {
  dlopen()
  ; return 0; }
  EOF
 -if { (eval echo configure:111333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:112316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:112658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -111348,7 +112331,7 @@
+@@ -111348,7 +112673,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
 -echo "configure:111352: checking for dld_link in -ldld" >&5
-+echo "configure:112335: checking for dld_link in -ldld" >&5
++echo "configure:112677: checking for dld_link in -ldld" >&5
  ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -111356,7 +112339,7 @@
+@@ -111356,7 +112681,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ldld  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 111360 "configure"
-+#line 112343 "configure"
++#line 112685 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
-@@ -111367,7 +112350,7 @@
+@@ -111367,7 +112692,7 @@ int main() {
  dld_link()
  ; return 0; }
  EOF
 -if { (eval echo configure:111371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:112354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:112696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -111423,7 +112406,7 @@
+@@ -111423,7 +112748,7 @@ fi
      LIBS="$lt_cv_dlopen_libs $LIBS"
  
      echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
 -echo "configure:111427: checking whether a program can dlopen itself" >&5
-+echo "configure:112410: checking whether a program can dlopen itself" >&5
++echo "configure:112752: checking whether a program can dlopen itself" >&5
  if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -111433,7 +112416,7 @@
+@@ -111433,7 +112758,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 111437 "configure"
-+#line 112420 "configure"
++#line 112762 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -111496,7 +112479,7 @@
+@@ -111496,7 +112821,7 @@ int main ()
      exit (status);
  }
  EOF
 -  if { (eval echo configure:111500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+  if { (eval echo configure:112483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
++  if { (eval echo configure:112825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
      case x$lt_status in
-@@ -111519,7 +112502,7 @@
+@@ -111519,7 +112844,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6
      if test "x$lt_cv_dlopen_self" = xyes; then
        wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
        echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
 -echo "configure:111523: checking whether a statically linked program can dlopen itself" >&5
-+echo "configure:112506: checking whether a statically linked program can dlopen itself" >&5
++echo "configure:112848: checking whether a statically linked program can dlopen itself" >&5
  if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -111529,7 +112512,7 @@
+@@ -111529,7 +112854,7 @@ else
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 111533 "configure"
-+#line 112516 "configure"
++#line 112858 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -111592,7 +112575,7 @@
+@@ -111592,7 +112917,7 @@ int main ()
      exit (status);
  }
  EOF
 -  if { (eval echo configure:111596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
-+  if { (eval echo configure:112579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
++  if { (eval echo configure:112921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
      (./conftest; exit; ) >&5 2>/dev/null
      lt_status=$?
      case x$lt_status in
-@@ -111633,11 +112616,11 @@
+@@ -111633,11 +112958,11 @@ fi
  
  # Report which library types will actually be built
  echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
 -echo "configure:111637: checking if libtool supports shared libraries" >&5
-+echo "configure:112620: checking if libtool supports shared libraries" >&5
++echo "configure:112962: checking if libtool supports shared libraries" >&5
  echo "$ac_t""$can_build_shared" 1>&6
  
  echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
 -echo "configure:111641: checking whether to build shared libraries" >&5
-+echo "configure:112624: checking whether to build shared libraries" >&5
++echo "configure:112966: checking whether to build shared libraries" >&5
  test "$can_build_shared" = "no" && enable_shared=no
  
  # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -111660,7 +112643,7 @@
+@@ -111660,7 +112985,7 @@ esac
  echo "$ac_t""$enable_shared" 1>&6
  
  echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
 -echo "configure:111664: checking whether to build static libraries" >&5
-+echo "configure:112647: checking whether to build static libraries" >&5
++echo "configure:112989: checking whether to build static libraries" >&5
  # Make sure either enable_shared or enable_static is yes.
  test "$enable_shared" = yes || enable_static=yes
  echo "$ac_t""$enable_static" 1>&6
-@@ -112346,7 +113329,7 @@
+@@ -112346,7 +113671,7 @@ ac_prog=ld
  if test "$GCC" = yes; then
    # Check if gcc -print-prog-name=ld gives a path.
    echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6
 -echo "configure:112350: checking for ld used by $CC" >&5
-+echo "configure:113333: checking for ld used by $CC" >&5
++echo "configure:113675: checking for ld used by $CC" >&5
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -112376,10 +113359,10 @@
+@@ -112376,10 +113701,10 @@ echo "configure:112350: checking for ld used by $CC" >&5
    esac
  elif test "$with_gnu_ld" = yes; then
    echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
 -echo "configure:112380: checking for GNU ld" >&5
-+echo "configure:113363: checking for GNU ld" >&5
++echo "configure:113705: checking for GNU ld" >&5
  else
    echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
 -echo "configure:112383: checking for non-GNU ld" >&5
-+echo "configure:113366: checking for non-GNU ld" >&5
++echo "configure:113708: checking for non-GNU ld" >&5
  fi
  if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
-@@ -112418,7 +113401,7 @@
+@@ -112418,7 +113743,7 @@ else
  fi
  test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
  echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
 -echo "configure:112422: checking if the linker ($LD) is GNU ld" >&5
-+echo "configure:113405: checking if the linker ($LD) is GNU ld" >&5
++echo "configure:113747: checking if the linker ($LD) is GNU ld" >&5
  if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -112484,7 +113467,7 @@
+@@ -112484,7 +113809,7 @@ fi
  
  # PORTME: fill in a description of your system's C++ link characteristics
  echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6
 -echo "configure:112488: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo "configure:113471: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo "configure:113813: checking whether the $compiler linker ($LD) supports shared libraries" >&5
  ld_shlibs_CXX=yes
  case $host_os in
    aix3*)
-@@ -112582,12 +113565,12 @@
+@@ -112582,12 +113907,12 @@ case $host_os in
        # Determine the default libpath from the value encoded in an empty executable.
        
  cat > conftest.$ac_ext <<EOF
 -#line 112586 "configure"
-+#line 113569 "configure"
++#line 113911 "configure"
  #include "confdefs.h"
  int main() {
  ; return 0; }
  EOF
 -if { (eval echo configure:112591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:113574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:113916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -112621,12 +113604,12 @@
+@@ -112621,12 +113946,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
        # Determine the default libpath from the value encoded in an empty executable.
        
  cat > conftest.$ac_ext <<EOF
 -#line 112625 "configure"
-+#line 113608 "configure"
++#line 113950 "configure"
  #include "confdefs.h"
  int main() {
  ; return 0; }
  EOF
 -if { (eval echo configure:112630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:113613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:113955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -113393,7 +114376,7 @@
+@@ -113393,7 +114718,7 @@ private:
  };
  EOF
  
 -if { (eval echo configure:113397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:114380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:114722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    # Parse the compiler output and extract the necessary
    # objects, libraries and library flags.
  
-@@ -113549,7 +114532,7 @@
+@@ -113549,7 +114874,7 @@ lt_prog_compiler_pic_CXX=
  lt_prog_compiler_static_CXX=
  
  echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
 -echo "configure:113553: checking for $compiler option to produce PIC" >&5
-+echo "configure:114536: checking for $compiler option to produce PIC" >&5
++echo "configure:114878: checking for $compiler option to produce PIC" >&5
   
    # C++ specific cases for pic, static, wl, etc.
    if test "$GXX" = yes; then
-@@ -113846,7 +114829,7 @@
+@@ -113846,7 +115171,7 @@ echo "$ac_t""$lt_prog_compiler_pic_CXX" 1>&6
  if test -n "$lt_prog_compiler_pic_CXX"; then
    
  echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works""... $ac_c" 1>&6
 -echo "configure:113850: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-+echo "configure:114833: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
++echo "configure:115175: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
  if eval "test \"`echo '$''{'lt_cv_prog_compiler_pic_works_CXX'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -113863,11 +114846,11 @@
+@@ -113863,11 +115188,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"configure:113867: $lt_compile\"" >&5)
-+   (eval echo "\"configure:114850: $lt_compile\"" >&5)
++   (eval echo "\"configure:115192: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "configure:113871: \$? = $ac_status" >&5
-+   echo "configure:114854: \$? = $ac_status" >&5
++   echo "configure:115196: \$? = $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.
-@@ -113909,7 +114892,7 @@
+@@ -113909,7 +115234,7 @@ esac
  #
  wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
  echo $ac_n "checking if $compiler static flag $lt_tmp_static_flag works""... $ac_c" 1>&6
 -echo "configure:113913: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+echo "configure:114896: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo "configure:115238: checking if $compiler static flag $lt_tmp_static_flag works" >&5
  if eval "test \"`echo '$''{'lt_cv_prog_compiler_static_works_CXX'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -113947,7 +114930,7 @@
+@@ -113947,7 +115272,7 @@ fi
  
  
  echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
 -echo "configure:113951: checking if $compiler supports -c -o file.$ac_objext" >&5
-+echo "configure:114934: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo "configure:115276: checking if $compiler supports -c -o file.$ac_objext" >&5
  if eval "test \"`echo '$''{'lt_cv_prog_compiler_c_o_CXX'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -113967,11 +114950,11 @@
+@@ -113967,11 +115292,11 @@ else
     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"configure:113971: $lt_compile\"" >&5)
-+   (eval echo "\"configure:114954: $lt_compile\"" >&5)
++   (eval echo "\"configure:115296: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "configure:113975: \$? = $ac_status" >&5
-+   echo "configure:114958: \$? = $ac_status" >&5
++   echo "configure:115300: \$? = $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
-@@ -114001,7 +114984,7 @@
+@@ -114001,7 +115326,7 @@ hard_links="nottested"
  if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
    # do not overwrite the value of need_locks provided by the user
    echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
 -echo "configure:114005: checking if we can lock with hard links" >&5
-+echo "configure:114988: checking if we can lock with hard links" >&5
++echo "configure:115330: checking if we can lock with hard links" >&5
    hard_links=yes
    $rm conftest*
    ln conftest.a conftest.b 2>/dev/null && hard_links=no
-@@ -114018,7 +115001,7 @@
+@@ -114018,7 +115343,7 @@ else
  fi
  
  echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6
 -echo "configure:114022: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+echo "configure:115005: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo "configure:115347: checking whether the $compiler linker ($LD) supports shared libraries" >&5
  
    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    case $host_os in
-@@ -114064,11 +115047,11 @@
+@@ -114064,11 +115389,11 @@ x|xyes)
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
        echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
 -echo "configure:114068: checking whether -lc should be explicitly linked in" >&5
-+echo "configure:115051: checking whether -lc should be explicitly linked in" >&5
++echo "configure:115393: checking whether -lc should be explicitly linked in" >&5
        $rm conftest*
        echo "$lt_simple_compile_test_code" > conftest.$ac_ext
  
 -      if { (eval echo configure:114072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
-+      if { (eval echo configure:115055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
++      if { (eval echo configure:115397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
          soname=conftest
          lib=conftest
          libobjs=conftest.$ac_objext
-@@ -114082,7 +115065,7 @@
+@@ -114082,7 +115407,7 @@ echo "configure:114068: checking whether -lc should be explicitly linked in" >&5
          libname=conftest
          lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
          allow_undefined_flag_CXX=
 -        if { (eval echo configure:114086: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
-+        if { (eval echo configure:115069: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
++        if { (eval echo configure:115411: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
          then
          archive_cmds_need_lc_CXX=no
          else
-@@ -114101,7 +115084,7 @@
+@@ -114101,7 +115426,7 @@ echo "configure:114068: checking whether -lc should be explicitly linked in" >&5
  esac
  
  echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
 -echo "configure:114105: checking dynamic linker characteristics" >&5
-+echo "configure:115088: checking dynamic linker characteristics" >&5
++echo "configure:115430: checking dynamic linker characteristics" >&5
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -114674,7 +115657,7 @@
+@@ -114674,7 +115999,7 @@ if test "$GCC" = yes; then
  fi
  
  echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
 -echo "configure:114678: checking how to hardcode library paths into programs" >&5
-+echo "configure:115661: checking how to hardcode library paths into programs" >&5
++echo "configure:116003: checking how to hardcode library paths into programs" >&5
  hardcode_action_CXX=
  if test -n "$hardcode_libdir_flag_spec_CXX" || \
     test -n "$runpath_var_CXX" || \
@@ -19041,7 +19393,7 @@
  makefile_am_files = Zend/Makefile.am TSRM/Makefile.am
  config_h_files = Zend/acconfig.h TSRM/acconfig.h
 -config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 Zend/acinclude.m4 ext/bcmath/config.m4 ext/bz2/config.m4 ext/calendar/config.m4 ext/ctype/config.m4 ext/curl/config.m4 ext/date/config0.m4 ext/dba/config.m4 ext/dom/config.m4 ext/enchant/config.m4 ext/ereg/config0.m4 ext/exif/config.m4 ext/fileinfo/config.m4 ext/filter/config.m4 ext/ftp/config.m4 ext/gd/config.m4 ext/gettext/config.m4 ext/gmp/config.m4 ext/hash/config.m4 ext/iconv/config.m4 ext/imap/config.m4 ext/interbase/config.m4 ext/intl/config.m4 ext/json/config.m4 ext/ldap/config.m4 ext/libxml/config0.m4 ext/mbstring/config.m4 ext/mcrypt/config.m4 ext/mssql/config.m4 ext/mysql/config.m4 ext/mysqli/config.m4 ext/mysqlnd/config9.m4 ext/oci8/config.m4 ext/odbc/config.m4 ext/openssl/config0.m4 ext/pcntl/config.m4 ext/pcre/config0.m4 ext/pdo/config.m4 ext/pdo_dblib/config.m4 ext/pdo_firebird/config.m4 ext/pdo_mysql/config.m4 ext/pdo_oci/config.m4 ext/pdo_odbc/config.m4 ext/pdo_pgsql/config.m4 ext/pdo_sqlite/config.m4 ext/pgsql/config.m4 ext/phar/config.m4 ext/posix/config.m4 ext/pspell/config.m4 ext/readline/config.m4 ext/recode/config.m4 ext/recode/config9.m4 ext/reflection/config.m4 ext/session/config.m4 ext/shmop/config.m4 ext/simplexml/config.m4 ext/snmp/config.m4 ext/soap/config.m4 ext/sockets/config.m4 ext/spl/config.m4 ext/sqlite/config.m4 ext/sqlite3/config0.m4 ext/standard/config.m4 ext/sybase_ct/config.m4 ext/sysvmsg/config.m4 ext/sysvsem/config.m4 ext/sysvshm/config.m4 ext/tidy/config.m4 ext/tokenizer/config.m4 ext/wddx/config.m4 ext/xml/config.m4 ext/xmlreader/config.m4 ext/xmlrpc/config.m4 ext/xmlwriter/config.m4 ext/xsl/config.m4 ext/zip/config.m4 ext/zlib/config0.m4 sapi/aolserver/config.m4 sapi/apache/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 sapi/apache_hooks/config.m4 sapi/caudium/config.m4 sapi/cli/config.m4 sapi/continuity/config.m4 sapi/embed/config.m4 sapi/fpm/config.m4 sapi/isapi/config.m4 sapi/litespeed/config.m4 sapi/milter/config.m4 sapi/nsapi/config.m4 sapi/phttpd/config.m4 sapi/pi3web/config.m4 sapi/roxen/config.m4 sapi/thttpd/config.m4 sapi/tux/config.m4 sapi/webjames/config.m4
-+config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 Zend/acinclude.m4 ext/apc/config.m4 ext/bcmath/config.m4 ext/bz2/config.m4 ext/calendar/config.m4 ext/ctype/config.m4 ext/curl/config.m4 ext/date/config0.m4 ext/dba/config.m4 ext/dom/config.m4 ext/enchant/config.m4 ext/ereg/config0.m4 ext/exif/config.m4 ext/fileinfo/config.m4 ext/filter/config.m4 ext/ftp/config.m4 ext/gd/config.m4 ext/gettext/config.m4 ext/gmp/config.m4 ext/hash/config.m4 ext/iconv/config.m4 ext/imap/config.m4 ext/interbase/config.m4 ext/intl/config.m4 ext/json/config.m4 ext/ldap/config.m4 ext/libxml/config0.m4 ext/mbstring/config.m4 ext/mcrypt/config.m4 ext/mssql/config.m4 ext/mysql/config.m4 ext/mysqli/config.m4 ext/mysqlnd/config9.m4 ext/oci8/config.m4 ext/odbc/config.m4 ext/openssl/config0.m4 ext/pcntl/config.m4 ext/pcre/config0.m4 ext/pdo/config.m4 ext/pdo_dblib/config.m4 ext/pdo_firebird/config.m4 ext/pdo_mysql/config.m4 ext/pdo_oci/config.m4 ext/pdo_odbc/config.m4 ext/pdo_pgsql/config.m4 ext/pdo_sqlite/config.m4 ext/pgsql/config.m4 ext/phar/config.m4 ext/posix/config.m4 ext/pspell/config.m4 ext/readline/config.m4 ext/recode/config.m4 ext/recode/config9.m4 ext/reflection/config.m4 ext/session/config.m4 ext/shmop/config.m4 ext/simplexml/config.m4 ext/snmp/config.m4 ext/soap/config.m4 ext/sockets/config.m4 ext/spl/config.m4 ext/sqlite/config.m4 ext/sqlite3/config0.m4 ext/standard/config.m4 ext/sybase_ct/config.m4 ext/sysvmsg/config.m4 ext/sysvsem/config.m4 ext/sysvshm/config.m4 ext/tidy/config.m4 ext/tokenizer/config.m4 ext/wddx/config.m4 ext/xml/config.m4 ext/xmlreader/config.m4 ext/xmlrpc/config.m4 ext/xmlwriter/config.m4 ext/xsl/config.m4 ext/zip/config.m4 ext/zlib/config0.m4 sapi/aolserver/config.m4 sapi/apache/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 sapi/apache_hooks/config.m4 sapi/caudium/config.m4 sapi/cli/config.m4 sapi/continuity/config.m4 sapi/embed/config.m4 sapi/fpm/config.m4 sapi/isapi/config.m4 sapi/litespeed/config.m4 sapi/milter/config.m4 sapi/nsapi/config.m4 sapi/phttpd/config.m4 sapi/pi3web/config.m4 sapi/roxen/config.m4 sapi/thttpd/config.m4 sapi/tux/config.m4 sapi/webjames/config.m4
++config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 Zend/acinclude.m4 ext/apc/config.m4 ext/bcmath/config.m4 ext/bz2/config.m4 ext/calendar/config.m4 ext/ctype/config.m4 ext/curl/config.m4 ext/date/config0.m4 ext/dba/config.m4 ext/dio/config.m4 ext/dom/config.m4 ext/enchant/config.m4 ext/ereg/config0.m4 ext/exif/config.m4 ext/fileinfo/config.m4 ext/filter/config.m4 ext/ftp/config.m4 ext/gd/config.m4 ext/gettext/config.m4 ext/gmp/config.m4 ext/hash/config.m4 ext/iconv/config.m4 ext/imap/config.m4 ext/interbase/config.m4 ext/intl/config.m4 ext/json/config.m4 ext/ldap/config.m4 ext/libxml/config0.m4 ext/mbstring/config.m4 ext/mcrypt/config.m4 ext/mssql/config.m4 ext/mysql/config.m4 ext/mysqli/config.m4 ext/mysqlnd/config9.m4 ext/oci8/config.m4 ext/odbc/config.m4 ext/openssl/config0.m4 ext/pcntl/config.m4 ext/pcre/config0.m4 ext/pdo/config.m4 ext/pdo_dblib/config.m4 ext/pdo_firebird/config.m4 ext/pdo_mysql/config.m4 ext/pdo_oci/config.m4 ext/pdo_odbc/config.m4 ext/pdo_pgsql/config.m4 ext/pdo_sqlite/config.m4 ext/pgsql/config.m4 ext/phar/config.m4 ext/posix/config.m4 ext/pspell/config.m4 ext/readline/config.m4 ext/recode/config9.m4 ext/recode/config.m4 ext/reflection/config.m4 ext/session/config.m4 ext/shmop/config.m4 ext/simplexml/config.m4 ext/snmp/config.m4 ext/soap/config.m4 ext/sockets/config.m4 ext/spl/config.m4 ext/sqlite3/config0.m4 ext/sqlite/config.m4 ext/standard/config.m4 ext/sybase_ct/config.m4 ext/sysvmsg/config.m4 ext/sysvsem/config.m4 ext/sysvshm/config.m4 ext/tidy/config.m4 ext/tokenizer/config.m4 ext/wddx/config.m4 ext/xml/config.m4 ext/xmlreader/config.m4 ext/xmlrpc/config.m4 ext/xmlwriter/config.m4 ext/xsl/config.m4 ext/zip/config.m4 ext/zlib/config0.m4 sapi/aolserver/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 sapi/apache/config.m4 sapi/apache_hooks/config.m4 sapi/caudium/config.m4 sapi/cli/config.m4 sapi/continuity/config.m4 sapi/embed/config.m4 sapi/fpm/config.m4 sapi/isapi/config.m4 sapi/litespeed/config.m4 sapi/milter/config.m4 sapi/nsapi/config.m4 sapi/phttpd/config.m4 sapi/pi3web/config.m4 sapi/roxen/config.m4 sapi/thttpd/config.m4 sapi/tux/config.m4 sapi/webjames/config.m4
 --- a/main/php_config.h.in
 +++ b/main/php_config.h.in
 @@ -1,4 +1,4 @@
@@ -19102,3 +19454,13 @@
  /* Whether to build bcmath as dynamic module */
  #undef COMPILE_DL_BCMATH
  
+@@ -1463,6 +1508,9 @@
+ /* Whether to build dba as dynamic module */
+ #undef COMPILE_DL_DBA
+ 
++/* Whether to build dio as dynamic module */
++#undef COMPILE_DL_DIO
++
+ /*   */
+ #undef HAVE_LIBXML
+