[packages] php5: PECL: include support for libevent

SVN-Revision: 27838

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 0596aedf9e40afc3c64ed4f98a60606a1a696568..2feb1fac31b17d6f55511bbef8db6a515e416630 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:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.php.net/distributions/
@@ -29,7 +29,7 @@ PHP5_MODULES = \
        hash \
        iconv \
        json \
-       ldap \
+       ldap libevent \
        mbstring mcrypt mysql \
        openssl \
        pcntl pdo pdo-mysql pdo-pgsql pdo-sqlite pgsql \
@@ -264,6 +264,12 @@ else
   CONFIGURE_ARGS+= --without-ldap
 endif
 
+ifneq ($(CONFIG_PACKAGE_php5-mod-libevent),)
+  CONFIGURE_ARGS+= --with-libevent=shared,"$(STAGING_DIR)/usr"
+else
+  CONFIGURE_ARGS+= --without-libevent
+endif
+
 ifneq ($(CONFIG_PACKAGE_php5-mod-mbstring),)
   CONFIGURE_ARGS+= --enable-mbstring=shared --enable-mbregex
 else
@@ -498,6 +504,7 @@ $(eval $(call BuildModule,hash,Hash))
 $(eval $(call BuildModule,iconv,iConv,+libiconv))
 $(eval $(call BuildModule,json,JSON))
 $(eval $(call BuildModule,ldap,LDAP,+libopenldap +libsasl2))
+$(eval $(call BuildModule,libevent,libevent,+libevent))
 $(eval $(call BuildModule,mbstring,MBString))
 $(eval $(call BuildModule,mcrypt,Mcrypt,+libmcrypt +libltdl))
 $(eval $(call BuildModule,mysql,MySQL,+libmysqlclient))

diff --git a/lang/php5/patches/020-PECL-add-libevent.patch b/lang/php5/patches/020-PECL-add-libevent.patch
new file mode 100644 (file)
index 0000000..71869a8
--- /dev/null
+++ b/lang/php5/patches/020-PECL-add-libevent.patch
@@ -0,0 +1,1758 @@
+--- /dev/null
++++ b/ext/libevent/CREDITS
+@@ -0,0 +1 @@
++Antony Dovgal, Arnaud Le Blanc
+--- /dev/null
++++ b/ext/libevent/config.m4
+@@ -0,0 +1,52 @@
++dnl $Id: config.m4 287913 2009-08-31 08:45:42Z tony2001 $
++
++PHP_ARG_WITH(libevent, for libevent support,
++[  --with-libevent             Include libevent support])
++
++if test "$PHP_LIBEVENT" != "no"; then
++  SEARCH_PATH="/usr /usr/local"
++  SEARCH_FOR="/include/event.h"
++
++  if test "$PHP_LIBEVENT" = "yes"; then
++    AC_MSG_CHECKING([for libevent headers in default path])
++    for i in $SEARCH_PATH ; do
++      if test -r $i/$SEARCH_FOR; then
++        LIBEVENT_DIR=$i
++        AC_MSG_RESULT(found in $i)
++      fi
++    done
++  else
++    AC_MSG_CHECKING([for libevent headers in $PHP_LIBEVENT])
++    if test -r $PHP_LIBEVENT/$SEARCH_FOR; then
++      LIBEVENT_DIR=$PHP_LIBEVENT
++      AC_MSG_RESULT([found])
++    fi
++  fi
++
++  if test -z "$LIBEVENT_DIR"; then
++    AC_MSG_RESULT([not found])
++    AC_MSG_ERROR([Cannot find libevent headers])
++  fi
++
++  PHP_ADD_INCLUDE($LIBEVENT_DIR/include)
++
++  LIBNAME=event
++  LIBSYMBOL=event_base_new
++
++  if test "x$PHP_LIBDIR" = "x"; then
++    PHP_LIBDIR=lib
++  fi
++
++  PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
++  [
++    PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $LIBEVENT_DIR/$PHP_LIBDIR, LIBEVENT_SHARED_LIBADD)
++  ],[
++    AC_MSG_ERROR([wrong libevent version {1.4.+ is required} or lib not found])
++  ],[
++    -L$LIBEVENT_DIR/$PHP_LIBDIR 
++  ])
++
++  PHP_ADD_EXTENSION_DEP(libevent, sockets, true)
++  PHP_SUBST(LIBEVENT_SHARED_LIBADD)
++  PHP_NEW_EXTENSION(libevent, libevent.c, $ext_shared)
++fi
+--- /dev/null
++++ b/ext/libevent/libevent.c
+@@ -0,0 +1,1564 @@
++/*
++  +----------------------------------------------------------------------+
++  | PHP Version 5                                                        |
++  +----------------------------------------------------------------------+
++  | Copyright (c) 1997-2008 The PHP Group                                |
++  +----------------------------------------------------------------------+
++  | This source file is subject to version 3.01 of the PHP license,      |
++  | that is bundled with this package in the file LICENSE, and is        |
++  | available through the world-wide-web at the following url:           |
++  | http://www.php.net/license/3_01.txt                                  |
++  | If you did not receive a copy of the PHP license and are unable to   |
++  | obtain it through the world-wide-web, please send a note to          |
++  | license@php.net so we can mail you a copy immediately.               |
++  +----------------------------------------------------------------------+
++  | Author: Antony Dovgal <tony@daylessday.org>                          |
++  |         Arnaud Le Blanc <lbarnaud@php.net>                           |
++  +----------------------------------------------------------------------+
++*/
++
++/* $Id: libevent.c 300303 2010-06-09 10:43:38Z tony2001 $ */
++
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
++#include "php.h"
++#include "php_ini.h"
++#include "ext/standard/info.h"
++#include "php_streams.h"
++#include "php_network.h"
++#include "php_libevent.h"
++
++#include <signal.h>
++
++#if PHP_VERSION_ID >= 50301 && (HAVE_SOCKETS || defined(COMPILE_DL_SOCKETS))
++# include "ext/sockets/php_sockets.h"
++# define LIBEVENT_SOCKETS_SUPPORT
++#endif
++
++#include <event.h>
++
++#if PHP_MAJOR_VERSION < 5
++# ifdef PHP_WIN32
++typedef SOCKET php_socket_t;
++# else
++typedef int php_socket_t;
++# endif
++
++# ifdef ZTS
++#  define TSRMLS_FETCH_FROM_CTX(ctx)  void ***tsrm_ls = (void ***) ctx
++#  define TSRMLS_SET_CTX(ctx)     ctx = (void ***) tsrm_ls
++# else
++#  define TSRMLS_FETCH_FROM_CTX(ctx)
++#  define TSRMLS_SET_CTX(ctx)
++# endif
++
++# ifndef Z_ADDREF_P
++#  define Z_ADDREF_P(x) (x)->refcount++
++# endif
++#endif
++
++static int le_event_base;
++static int le_event;
++static int le_bufferevent;
++
++#ifdef COMPILE_DL_LIBEVENT
++ZEND_GET_MODULE(libevent)
++#endif
++
++typedef struct _php_event_base_t { /* {{{ */
++      struct event_base *base;
++      int rsrc_id;
++      zend_uint events;
++} php_event_base_t;
++/* }}} */
++
++typedef struct _php_event_callback_t { /* {{{ */
++      zval *func;
++      zval *arg;
++} php_event_callback_t;
++/* }}} */
++
++typedef struct _php_event_t { /* {{{ */
++      struct event *event;
++      int rsrc_id;
++      int stream_id;
++      php_event_base_t *base;
++      php_event_callback_t *callback;
++#ifdef ZTS
++      void ***thread_ctx;
++#endif
++      int in_free;
++} php_event_t;
++/* }}} */
++
++typedef struct _php_bufferevent_t { /* {{{ */
++      struct bufferevent *bevent;
++      int rsrc_id;
++      php_event_base_t *base;
++      zval *readcb;
++      zval *writecb;
++      zval *errorcb;
++      zval *arg;
++#ifdef ZTS
++      void ***thread_ctx;
++#endif
++} php_bufferevent_t;
++/* }}} */
++
++#define ZVAL_TO_BASE(zval, base) \
++      ZEND_FETCH_RESOURCE(base, php_event_base_t *, &zval, -1, "event base", le_event_base)
++
++#define ZVAL_TO_EVENT(zval, event) \
++      ZEND_FETCH_RESOURCE(event, php_event_t *, &zval, -1, "event", le_event)
++
++#define ZVAL_TO_BEVENT(zval, bevent) \
++      ZEND_FETCH_RESOURCE(bevent, php_bufferevent_t *, &zval, -1, "buffer event", le_bufferevent)
++
++/* {{{ internal funcs */
++
++static inline void _php_event_callback_free(php_event_callback_t *callback) /* {{{ */
++{
++      if (!callback) {
++              return;
++      }
++
++      zval_ptr_dtor(&callback->func);
++      if (callback->arg) {
++              zval_ptr_dtor(&callback->arg);
++      }
++      efree(callback);
++}
++/* }}} */
++
++static void _php_event_base_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
++{
++      php_event_base_t *base = (php_event_base_t*)rsrc->ptr;
++
++      event_base_free(base->base);
++      efree(base);
++}
++/* }}} */
++
++static void _php_event_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
++{
++      php_event_t *event = (php_event_t*)rsrc->ptr;
++      int base_id = -1;
++
++      if (event->in_free) {
++              return;
++      }
++
++      event->in_free = 1;
++
++      if (event->base) {
++              base_id = event->base->rsrc_id;
++              --event->base->events;
++      }
++      if (event->stream_id >= 0) {
++              zend_list_delete(event->stream_id);
++      }
++      event_del(event->event);
++
++      _php_event_callback_free(event->callback);
++      efree(event->event);
++      efree(event);
++
++      if (base_id >= 0) {
++              zend_list_delete(base_id);
++      }
++}
++/* }}} */
++
++static void _php_bufferevent_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
++{
++      php_bufferevent_t *bevent = (php_bufferevent_t*)rsrc->ptr;
++      int base_id = -1;
++
++      if (bevent->base) {
++              base_id = bevent->base->rsrc_id;
++              --bevent->base->events;
++      }
++      if (bevent->readcb) {
++              zval_ptr_dtor(&(bevent->readcb));
++      }
++      if (bevent->writecb) {
++              zval_ptr_dtor(&(bevent->writecb));
++      }
++      if (bevent->errorcb) {
++              zval_ptr_dtor(&(bevent->errorcb));
++      }
++      if (bevent->arg) {
++              zval_ptr_dtor(&(bevent->arg));
++      }
++
++      bufferevent_free(bevent->bevent);
++      efree(bevent);
++
++      if (base_id >= 0) {
++              zend_list_delete(base_id);
++      }
++}
++/* }}} */
++
++static void _php_event_callback(int fd, short events, void *arg) /* {{{ */
++{
++      zval *args[3];
++      php_event_t *event = (php_event_t *)arg;
++      php_event_callback_t *callback;
++      zval retval;
++      TSRMLS_FETCH_FROM_CTX(event ? event->thread_ctx : NULL);
++
++      if (!event || !event->callback || !event->base) {
++              return;
++      }
++
++      callback = event->callback;
++
++      MAKE_STD_ZVAL(args[0]);
++      if (event->stream_id >= 0) {
++              ZVAL_RESOURCE(args[0], event->stream_id);
++              zend_list_addref(event->stream_id);
++      } else {
++              ZVAL_NULL(args[0]);
++      }
++      
++      MAKE_STD_ZVAL(args[1]);
++      ZVAL_LONG(args[1], events);
++
++      args[2] = callback->arg;
++      Z_ADDREF_P(callback->arg);
++      
++      if (call_user_function(EG(function_table), NULL, callback->func, &retval, 3, args TSRMLS_CC) == SUCCESS) {
++              zval_dtor(&retval);
++      }
++
++      zval_ptr_dtor(&(args[0]));
++      zval_ptr_dtor(&(args[1]));
++      zval_ptr_dtor(&(args[2])); 
++      
++}
++/* }}} */
++
++static void _php_bufferevent_readcb(struct bufferevent *be, void *arg) /* {{{ */
++{
++      zval *args[2];
++      zval retval;
++      php_bufferevent_t *bevent = (php_bufferevent_t *)arg;
++      TSRMLS_FETCH_FROM_CTX(bevent ? bevent->thread_ctx : NULL);
++
++      if (!bevent || !bevent->base || !bevent->readcb) {
++              return;
++      }
++
++      MAKE_STD_ZVAL(args[0]);
++      ZVAL_RESOURCE(args[0], bevent->rsrc_id);
++      zend_list_addref(bevent->rsrc_id); /* we do refcount-- later in zval_ptr_dtor */
++      
++      args[1] = bevent->arg;
++      Z_ADDREF_P(args[1]);
++      
++      if (call_user_function(EG(function_table), NULL, bevent->readcb, &retval, 2, args TSRMLS_CC) == SUCCESS) {
++              zval_dtor(&retval);
++      }
++
++      zval_ptr_dtor(&(args[0]));
++      zval_ptr_dtor(&(args[1])); 
++
++}
++/* }}} */
++
++static void _php_bufferevent_writecb(struct bufferevent *be, void *arg) /* {{{ */
++{
++      zval *args[2];
++      zval retval;
++      php_bufferevent_t *bevent = (php_bufferevent_t *)arg;
++      TSRMLS_FETCH_FROM_CTX(bevent ? bevent->thread_ctx : NULL);
++
++      if (!bevent || !bevent->base || !bevent->writecb) {
++              return;
++      }
++
++      MAKE_STD_ZVAL(args[0]);
++      ZVAL_RESOURCE(args[0], bevent->rsrc_id);
++      zend_list_addref(bevent->rsrc_id); /* we do refcount-- later in zval_ptr_dtor */
++      
++      args[1] = bevent->arg;
++      Z_ADDREF_P(args[1]);
++      
++      if (call_user_function(EG(function_table), NULL, bevent->writecb, &retval, 2, args TSRMLS_CC) == SUCCESS) {
++              zval_dtor(&retval);
++      }
++
++      zval_ptr_dtor(&(args[0]));
++      zval_ptr_dtor(&(args[1])); 
++      
++}
++/* }}} */
++
++static void _php_bufferevent_errorcb(struct bufferevent *be, short what, void *arg) /* {{{ */
++{
++      zval *args[3];
++      zval retval;
++      php_bufferevent_t *bevent = (php_bufferevent_t *)arg;
++      TSRMLS_FETCH_FROM_CTX(bevent ? bevent->thread_ctx : NULL);
++
++      if (!bevent || !bevent->base || !bevent->errorcb) {
++              return;
++      }
++
++      MAKE_STD_ZVAL(args[0]);
++      ZVAL_RESOURCE(args[0], bevent->rsrc_id);
++      zend_list_addref(bevent->rsrc_id); /* we do refcount-- later in zval_ptr_dtor */
++      
++      MAKE_STD_ZVAL(args[1]);
++      ZVAL_LONG(args[1], what);
++
++      args[2] = bevent->arg;
++      Z_ADDREF_P(args[2]);
++      
++      if (call_user_function(EG(function_table), NULL, bevent->errorcb, &retval, 3, args TSRMLS_CC) == SUCCESS) {
++              zval_dtor(&retval);
++      }
++
++      zval_ptr_dtor(&(args[0]));
++      zval_ptr_dtor(&(args[1]));
++      zval_ptr_dtor(&(args[2])); 
++      
++}
++/* }}} */
++
++/* }}} */
++
++
++/* {{{ proto resource event_base_new() 
++ */
++static PHP_FUNCTION(event_base_new)
++{
++      php_event_base_t *base;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") != SUCCESS) {
++              return;
++      }
++
++      base = emalloc(sizeof(php_event_base_t));
++      base->base = event_base_new();
++      if (!base->base) {
++              efree(base);
++              RETURN_FALSE;
++      }
++
++      base->events = 0;
++
++      base->rsrc_id = zend_list_insert(base, le_event_base);
++      RETURN_RESOURCE(base->rsrc_id);
++}
++/* }}} */
++
++/* {{{ proto void event_base_free(resource base) 
++ */
++static PHP_FUNCTION(event_base_free)
++{
++      zval *zbase;
++      php_event_base_t *base;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zbase) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_BASE(zbase, base);
++
++      if (base->events > 0) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "base has events attached to it and cannot be freed");
++              RETURN_FALSE;
++      }
++
++      zend_list_delete(base->rsrc_id);
++}
++/* }}} */
++
++/* {{{ proto int event_base_loop(resource base[, int flags]) 
++ */
++static PHP_FUNCTION(event_base_loop)
++{
++      zval *zbase;
++      php_event_base_t *base;
++      long flags = 0;
++      int ret;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &zbase, &flags) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_BASE(zbase, base);
++      zend_list_addref(base->rsrc_id); /* make sure the base cannot be destroyed during the loop */
++      ret = event_base_loop(base->base, flags);
++      zend_list_delete(base->rsrc_id);
++
++      RETURN_LONG(ret);
++}
++/* }}} */
++
++/* {{{ proto bool event_base_loopbreak(resource base) 
++ */
++static PHP_FUNCTION(event_base_loopbreak)
++{
++      zval *zbase;
++      php_event_base_t *base;
++      int ret;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zbase) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_BASE(zbase, base);
++      ret = event_base_loopbreak(base->base);
++      if (ret == 0) {
++              RETURN_TRUE;
++      }
++      RETURN_FALSE;
++}
++/* }}} */
++
++/* {{{ proto bool event_base_loopexit(resource base[, int timeout]) 
++ */
++static PHP_FUNCTION(event_base_loopexit)
++{
++      zval *zbase;
++      php_event_base_t *base;
++      int ret;
++      long timeout = -1;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &zbase, &timeout) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_BASE(zbase, base);
++
++      if (timeout < 0) {
++              ret = event_base_loopexit(base->base, NULL);
++      } else {
++              struct timeval time;
++              
++              time.tv_usec = timeout % 1000000;
++              time.tv_sec = timeout / 1000000;
++              ret = event_base_loopexit(base->base, &time);
++      }
++
++      if (ret == 0) {
++              RETURN_TRUE;
++      }
++      RETURN_FALSE;
++}
++/* }}} */
++
++/* {{{ proto bool event_base_set(resource event, resource base) 
++ */
++static PHP_FUNCTION(event_base_set)
++{
++      zval *zbase, *zevent;
++      php_event_base_t *base, *old_base;
++      php_event_t *event;
++      int ret;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr", &zevent, &zbase) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_BASE(zbase, base);
++      ZVAL_TO_EVENT(zevent, event);
++
++      old_base = event->base;
++      ret = event_base_set(base->base, event->event);
++
++      if (ret == 0) {
++              if (base != old_base) {
++                      /* make sure the base is destroyed after the event */
++                      zend_list_addref(base->rsrc_id);
++                      ++base->events;
++              }
++
++              if (old_base) {
++                      --old_base->events;
++                      zend_list_delete(old_base->rsrc_id);
++              }
++
++              event->base = base;
++              RETURN_TRUE;
++      }
++      RETURN_FALSE;
++}
++/* }}} */
++
++/* {{{ proto bool event_base_priority_init(resource base, int npriorities) 
++ */
++static PHP_FUNCTION(event_base_priority_init)
++{
++      zval *zbase;
++      php_event_base_t *base;
++      long npriorities;
++      int ret;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &zbase, &npriorities) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_BASE(zbase, base);
++
++      if (npriorities < 0) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "npriorities cannot be less than zero");
++              RETURN_FALSE;
++      }
++
++      ret = event_base_priority_init(base->base, npriorities);
++      if (ret == 0) {
++              RETURN_TRUE;
++      }
++      RETURN_FALSE;
++}
++/* }}} */
++
++
++/* {{{ proto resource event_new() 
++ */
++static PHP_FUNCTION(event_new)
++{
++      php_event_t *event;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") != SUCCESS) {
++              return;
++      }
++
++      event = emalloc(sizeof(php_event_t));
++      event->event = ecalloc(1, sizeof(struct event));
++
++      event->stream_id = -1;
++      event->callback = NULL;
++      event->base = NULL;
++      event->in_free = 0;
++      TSRMLS_SET_CTX(event->thread_ctx);
++
++      event->rsrc_id = zend_list_insert(event, le_event);
++      RETURN_RESOURCE(event->rsrc_id);
++}
++/* }}} */
++
++/* {{{ proto void event_free(resource event) 
++ */
++static PHP_FUNCTION(event_free)
++{
++      zval *zevent;
++      php_event_t *event;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zevent) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_EVENT(zevent, event);
++      zend_list_delete(event->rsrc_id);
++}
++/* }}} */
++
++/* {{{ proto bool event_add(resource event[, int timeout])
++ */
++static PHP_FUNCTION(event_add)
++{
++      zval *zevent;
++      php_event_t *event;
++      int ret;
++      long timeout = -1;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &zevent, &timeout) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_EVENT(zevent, event);
++
++      if (!event->base) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to add event without an event base");
++              RETURN_FALSE;
++      }
++
++      if (timeout < 0) {
++              ret = event_add(event->event, NULL);
++      } else {
++              struct timeval time;
++              
++              time.tv_usec = timeout % 1000000;
++              time.tv_sec = timeout / 1000000;
++              ret = event_add(event->event, &time);
++      }
++
++      if (ret != 0) {
++              RETURN_FALSE;
++      }
++
++      RETURN_TRUE;
++}
++/* }}} */
++
++/* {{{ proto bool event_set(resource event, resource fd, int events, mixed callback[, mixed arg]) 
++ */
++static PHP_FUNCTION(event_set)
++{
++      zval *zevent, **fd, *zcallback, *zarg = NULL;
++      php_event_t *event;
++      long events;
++      php_event_callback_t *callback, *old_callback;
++      char *func_name;
++      php_stream *stream;
++      php_socket_t file_desc;
++#ifdef LIBEVENT_SOCKETS_SUPPORT
++      php_socket *php_sock;
++#endif
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZlz|z", &zevent, &fd, &events, &zcallback, &zarg) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_EVENT(zevent, event);
++
++      if (events & EV_SIGNAL) {
++              /* signal support */
++              convert_to_long_ex(fd);
++              file_desc = Z_LVAL_PP(fd);
++              if (file_desc < 0 || file_desc >= NSIG) {
++                      php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid signal passed");
++                      RETURN_FALSE;
++              }
++      } else {
++              if (ZEND_FETCH_RESOURCE_NO_RETURN(stream, php_stream *, fd, -1, NULL, php_file_le_stream())) {
++                      if (php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&file_desc, 1) != SUCCESS || file_desc < 0) {
++                              RETURN_FALSE;
++                      }
++              } else {
++#ifdef LIBEVENT_SOCKETS_SUPPORT
++                      if (ZEND_FETCH_RESOURCE_NO_RETURN(php_sock, php_socket *, fd, -1, NULL, php_sockets_le_socket())) {
++                              file_desc = php_sock->bsd_socket;
++                      } else {
++                              php_error_docref(NULL TSRMLS_CC, E_WARNING, "fd argument must be either valid PHP stream or valid PHP socket resource");
++                              RETURN_FALSE;
++                      }
++#else
++                      php_error_docref(NULL TSRMLS_CC, E_WARNING, "fd argument must be valid PHP stream resource");
++                      RETURN_FALSE;
++#endif
++              }
++      }
++
++      if (!zend_is_callable(zcallback, 0, &func_name TSRMLS_CC)) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s' is not a valid callback", func_name);
++              efree(func_name);
++              RETURN_FALSE;
++      }
++      efree(func_name);
++
++      zval_add_ref(&zcallback);
++      if (zarg) {
++              zval_add_ref(&zarg);
++      } else {
++              ALLOC_INIT_ZVAL(zarg);
++      }
++
++      callback = emalloc(sizeof(php_event_callback_t));
++      callback->func = zcallback;
++      callback->arg = zarg;
++
++      old_callback = event->callback;
++      event->callback = callback;
++      if (events & EV_SIGNAL) {
++              event->stream_id = -1;
++      } else {
++              zend_list_addref(Z_LVAL_PP(fd));
++              event->stream_id = Z_LVAL_PP(fd);
++      }
++
++      event_set(event->event, (int)file_desc, (short)events, _php_event_callback, event);
++
++      if (old_callback) {
++              _php_event_callback_free(old_callback);
++      }
++      RETURN_TRUE;
++}
++/* }}} */
++
++/* {{{ proto bool event_del(resource event) 
++ */
++static PHP_FUNCTION(event_del)
++{
++      zval *zevent;
++      php_event_t *event;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zevent) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_EVENT(zevent, event);
++
++      if (!event->base) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to delete event without an event base");
++              RETURN_FALSE;
++      }
++
++      if (event_del(event->event) == 0) {
++              RETURN_TRUE;
++      }
++      RETURN_FALSE;
++}
++/* }}} */
++
++
++/* {{{ proto bool event_timer_set(resource event, mixed callback[, mixed arg]) 
++ */
++static PHP_FUNCTION(event_timer_set)
++{
++      zval *zevent, *zcallback, *zarg = NULL;
++      php_event_t *event;
++      php_event_callback_t *callback, *old_callback;
++      char *func_name;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz|z", &zevent, &zcallback, &zarg) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_EVENT(zevent, event);
++
++      if (!zend_is_callable(zcallback, 0, &func_name TSRMLS_CC)) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s' is not a valid callback", func_name);
++              efree(func_name);
++              RETURN_FALSE;
++      }
++      efree(func_name);
++
++      zval_add_ref(&zcallback);
++      if (zarg) {
++              zval_add_ref(&zarg);
++      } else {
++              ALLOC_INIT_ZVAL(zarg);
++      }
++
++      callback = emalloc(sizeof(php_event_callback_t));
++      callback->func = zcallback;
++      callback->arg = zarg;
++
++      old_callback = event->callback;
++      event->callback = callback;
++      if (event->stream_id >= 0) {
++              zend_list_delete(event->stream_id);
++      }
++      event->stream_id = -1;
++
++      event_set(event->event, -1, 0, _php_event_callback, event);
++
++      if (old_callback) {
++              _php_event_callback_free(old_callback);
++      }
++      RETURN_TRUE;
++}
++/* }}} */
++
++/* {{{ proto bool event_timer_pending(resource event[, int timeout])
++ */
++static PHP_FUNCTION(event_timer_pending)
++{
++      zval *zevent;
++      php_event_t *event;
++      int ret;
++      long timeout = -1;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &zevent, &timeout) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_EVENT(zevent, event);
++
++      if (timeout < 0) {
++              ret = event_pending(event->event, EV_TIMEOUT, NULL);
++      } else {
++              struct timeval time;
++              
++              time.tv_usec = timeout % 1000000;
++              time.tv_sec = timeout / 1000000;
++              ret = event_pending(event->event, EV_TIMEOUT, &time);
++      }
++
++      if (ret != 0) {
++              RETURN_FALSE;
++      }
++      RETURN_TRUE;
++}
++/* }}} */
++
++
++
++/* {{{ proto resource event_buffer_new(resource stream, mixed readcb, mixed writecb, mixed errorcb[, mixed arg]) 
++ */
++static PHP_FUNCTION(event_buffer_new)
++{
++      php_bufferevent_t *bevent;
++      php_stream *stream;
++      zval *zstream, *zreadcb, *zwritecb, *zerrorcb, *zarg = NULL;
++      php_socket_t fd;
++      char *func_name;
++#ifdef LIBEVENT_SOCKETS_SUPPORT
++      php_socket *php_sock;
++#endif
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rzzz|z", &zstream, &zreadcb, &zwritecb, &zerrorcb, &zarg) != SUCCESS) {
++              return;
++      }
++
++      if (ZEND_FETCH_RESOURCE_NO_RETURN(stream, php_stream *, &zstream, -1, NULL, php_file_le_stream())) {
++              if (php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&fd, 1) != SUCCESS || fd < 0) {
++                      RETURN_FALSE;
++              }
++      } else {
++#ifdef LIBEVENT_SOCKETS_SUPPORT
++              if (ZEND_FETCH_RESOURCE_NO_RETURN(php_sock, php_socket *, &zstream, -1, NULL, php_sockets_le_socket())) {
++                      fd = php_sock->bsd_socket;
++              } else {
++                      php_error_docref(NULL TSRMLS_CC, E_WARNING, "stream argument must be either valid PHP stream or valid PHP socket resource");
++                      RETURN_FALSE;
++              }
++#else
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "stream argument must be valid PHP stream resource");
++              RETURN_FALSE;
++#endif
++      }
++
++      if (Z_TYPE_P(zreadcb) != IS_NULL) {
++              if (!zend_is_callable(zreadcb, 0, &func_name TSRMLS_CC)) {
++                      php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s' is not a valid read callback", func_name);
++                      efree(func_name);
++                      RETURN_FALSE;
++              }
++              efree(func_name);
++      } else {
++              zreadcb = NULL;
++      }
++
++      if (Z_TYPE_P(zwritecb) != IS_NULL) {
++              if (!zend_is_callable(zwritecb, 0, &func_name TSRMLS_CC)) {
++                      php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s' is not a valid write callback", func_name);
++                      efree(func_name);
++                      RETURN_FALSE;
++              }
++              efree(func_name);
++      } else {
++              zwritecb = NULL;
++      }
++
++      if (!zend_is_callable(zerrorcb, 0, &func_name TSRMLS_CC)) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s' is not a valid error callback", func_name);
++              efree(func_name);
++              RETURN_FALSE;
++      }
++      efree(func_name);
++
++      bevent = emalloc(sizeof(php_bufferevent_t));
++      bevent->bevent = bufferevent_new(fd, _php_bufferevent_readcb, _php_bufferevent_writecb, _php_bufferevent_errorcb, bevent);
++
++      bevent->base = NULL;
++
++      if (zreadcb) {
++              zval_add_ref(&zreadcb);
++      }
++      bevent->readcb = zreadcb;
++      
++      if (zwritecb) {
++              zval_add_ref(&zwritecb);
++      }
++      bevent->writecb = zwritecb;
++              
++      zval_add_ref(&zerrorcb);
++      bevent->errorcb = zerrorcb;
++
++      if (zarg) {
++              zval_add_ref(&zarg);
++              bevent->arg = zarg;
++      } else {
++              ALLOC_INIT_ZVAL(bevent->arg);
++      }
++
++      TSRMLS_SET_CTX(bevent->thread_ctx);
++
++      bevent->rsrc_id = zend_list_insert(bevent, le_bufferevent);
++      RETURN_RESOURCE(bevent->rsrc_id);
++}
++/* }}} */
++
++/* {{{ proto void event_buffer_free(resource bevent) 
++ */
++static PHP_FUNCTION(event_buffer_free)
++{
++      zval *zbevent;
++      php_bufferevent_t *bevent;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zbevent) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_BEVENT(zbevent, bevent);
++      zend_list_delete(bevent->rsrc_id);
++}
++/* }}} */
++
++/* {{{ proto bool event_buffer_base_set(resource bevent, resource base) 
++ */
++static PHP_FUNCTION(event_buffer_base_set)
++{
++      zval *zbase, *zbevent;
++      php_event_base_t *base, *old_base;
++      php_bufferevent_t *bevent;
++      int ret;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr", &zbevent, &zbase) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_BASE(zbase, base);
++      ZVAL_TO_BEVENT(zbevent, bevent);
++
++      old_base = bevent->base;
++      ret = bufferevent_base_set(base->base, bevent->bevent);
++
++      if (ret == 0) {
++              if (base != old_base) {
++                      /* make sure the base is destroyed after the event */
++                      zend_list_addref(base->rsrc_id);
++                      ++base->events;
++              }
++
++              if (old_base) {
++                      --old_base->events;
++                      zend_list_delete(old_base->rsrc_id);
++              }
++
++              bevent->base = base;
++              RETURN_TRUE;
++      }
++      RETURN_FALSE;
++}
++/* }}} */
++
++/* {{{ proto bool event_buffer_priority_set(resource bevent, int priority) 
++ */
++static PHP_FUNCTION(event_buffer_priority_set)
++{
++      zval *zbevent;
++      php_bufferevent_t *bevent;
++      long priority;
++      int ret;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &zbevent, &priority) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_BEVENT(zbevent, bevent);
++
++      if (!bevent->base) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set event priority without an event base");
++              RETURN_FALSE;
++      }
++
++      ret = bufferevent_priority_set(bevent->bevent, priority);
++
++      if (ret == 0) {
++              RETURN_TRUE;
++      }
++      RETURN_FALSE;
++}
++/* }}} */
++
++/* {{{ proto bool event_buffer_write(resource bevent, string data[, int data_size]) 
++ */
++static PHP_FUNCTION(event_buffer_write)
++{
++      zval *zbevent;
++      php_bufferevent_t *bevent;
++      char *data;
++      int data_len;
++      long data_size = -1;
++      int ret;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &zbevent, &data, &data_len, &data_size) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_BEVENT(zbevent, bevent);
++
++      if (ZEND_NUM_ARGS() < 3 || data_size < 0) {
++              data_size = data_len;
++      } else if (data_size > data_len) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "data_size out of range");
++              RETURN_FALSE;
++      }
++
++      ret = bufferevent_write(bevent->bevent, (const void *)data, data_size);
++
++      if (ret == 0) {
++              RETURN_TRUE;
++      }
++      RETURN_FALSE;
++}
++/* }}} */
++
++/* {{{ proto string event_buffer_read(resource bevent, int data_size) 
++ */
++static PHP_FUNCTION(event_buffer_read)
++{
++      zval *zbevent;
++      php_bufferevent_t *bevent;
++      char *data;
++      long data_size;
++      int ret;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &zbevent, &data_size) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_BEVENT(zbevent, bevent);
++
++      if (data_size == 0) {
++              RETURN_EMPTY_STRING();
++      } else if (data_size < 0) {
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "data_size cannot be less than zero");
++              RETURN_FALSE;
++      }
++
++      data = safe_emalloc((int)data_size, sizeof(char), 1);
++
++      ret = bufferevent_read(bevent->bevent, data, data_size);
++      if (ret > 0) {
++              if (ret > data_size) { /* paranoia */
++                      ret = data_size;
++              }
++              data[ret] = '\0';
++              RETURN_STRINGL(data, ret, 0);
++      }
++      efree(data);
++      RETURN_EMPTY_STRING();
++}
++/* }}} */
++
++/* {{{ proto bool event_buffer_enable(resource bevent, int events) 
++ */
++static PHP_FUNCTION(event_buffer_enable)
++{
++      zval *zbevent;
++      php_bufferevent_t *bevent;
++      long events;
++      int ret;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &zbevent, &events) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_BEVENT(zbevent, bevent);
++
++      ret = bufferevent_enable(bevent->bevent, events);
++
++      if (ret == 0) {
++              RETURN_TRUE;
++      }
++      RETURN_FALSE;
++}
++/* }}} */
++
++/* {{{ proto bool event_buffer_disable(resource bevent, int events) 
++ */
++static PHP_FUNCTION(event_buffer_disable)
++{
++      zval *zbevent;
++      php_bufferevent_t *bevent;
++      long events;
++      int ret;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &zbevent, &events) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_BEVENT(zbevent, bevent);
++
++      ret = bufferevent_disable(bevent->bevent, events);
++
++      if (ret == 0) {
++              RETURN_TRUE;
++      }
++      RETURN_FALSE;
++}
++/* }}} */
++
++/* {{{ proto void event_buffer_timeout_set(resource bevent, int read_timeout, int write_timeout) 
++ */
++static PHP_FUNCTION(event_buffer_timeout_set)
++{
++      zval *zbevent;
++      php_bufferevent_t *bevent;
++      long read_timeout, write_timeout;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rll", &zbevent, &read_timeout, &write_timeout) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_BEVENT(zbevent, bevent);
++      bufferevent_settimeout(bevent->bevent, read_timeout, write_timeout);
++}
++/* }}} */
++
++/* {{{ proto void event_buffer_watermark_set(resource bevent, int events, int lowmark, int highmark) 
++ */
++static PHP_FUNCTION(event_buffer_watermark_set)
++{
++      zval *zbevent;
++      php_bufferevent_t *bevent;
++      long events, lowmark, highmark;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlll", &zbevent, &events, &lowmark, &highmark) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_BEVENT(zbevent, bevent);
++      bufferevent_setwatermark(bevent->bevent, events, lowmark, highmark);
++}
++/* }}} */
++
++/* {{{ proto void event_buffer_fd_set(resource bevent, resource fd) 
++ */
++static PHP_FUNCTION(event_buffer_fd_set)
++{
++      zval *zbevent, *zfd;
++      php_stream *stream;
++      php_bufferevent_t *bevent;
++      php_socket_t fd;
++#ifdef LIBEVENT_SOCKETS_SUPPORT
++      php_socket *php_sock;
++#endif
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr", &zbevent, &zfd) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_BEVENT(zbevent, bevent);
++      if (ZEND_FETCH_RESOURCE_NO_RETURN(stream, php_stream *, &zfd, -1, NULL, php_file_le_stream())) {
++              if (php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&fd, 1) != SUCCESS || fd < 0) {
++                      RETURN_FALSE;
++              }
++      } else {
++#ifdef LIBEVENT_SOCKETS_SUPPORT
++              if (ZEND_FETCH_RESOURCE_NO_RETURN(php_sock, php_socket *, &zfd, -1, NULL, php_sockets_le_socket())) {
++                      fd = php_sock->bsd_socket;
++              } else {
++                      php_error_docref(NULL TSRMLS_CC, E_WARNING, "fd argument must be either valid PHP stream or valid PHP socket resource");
++                      RETURN_FALSE;
++              }
++#else
++              php_error_docref(NULL TSRMLS_CC, E_WARNING, "fd argument must be valid PHP stream resource");
++              RETURN_FALSE;
++#endif
++      }
++
++      bufferevent_setfd(bevent->bevent, fd);
++}
++/* }}} */
++
++/* {{{ proto resource event_buffer_set_callback(resource bevent, mixed readcb, mixed writecb, mixed errorcb[, mixed arg]) 
++ */
++static PHP_FUNCTION(event_buffer_set_callback)
++{
++      php_bufferevent_t *bevent;
++      zval *zbevent, *zreadcb, *zwritecb, *zerrorcb, *zarg = NULL;
++      char *func_name;
++
++      if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rzzz|z", &zbevent, &zreadcb, &zwritecb, &zerrorcb, &zarg) != SUCCESS) {
++              return;
++      }
++
++      ZVAL_TO_BEVENT(zbevent, bevent);
++
++      if (Z_TYPE_P(zreadcb) != IS_NULL) {
++              if (!zend_is_callable(zreadcb, 0, &func_name TSRMLS_CC)) {
++                      php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s' is not a valid read callback", func_name);
++                      efree(func_name);
++                      RETURN_FALSE;
++              }
++              efree(func_name);
++      } else {
++              zreadcb = NULL;
++      }
++
++      if (Z_TYPE_P(zwritecb) != IS_NULL) {
++              if (!zend_is_callable(zwritecb, 0, &func_name TSRMLS_CC)) {
++                      php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s' is not a valid write callback", func_name);
++                      efree(func_name);
++                      RETURN_FALSE;
++              }
++              efree(func_name);
++      } else {
++              zwritecb = NULL;
++      }
++
++      if (Z_TYPE_P(zerrorcb) != IS_NULL) {
++              if (!zend_is_callable(zerrorcb, 0, &func_name TSRMLS_CC)) {
++                      php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s' is not a valid error callback", func_name);
++                      efree(func_name);
++                      RETURN_FALSE;
++              }
++              efree(func_name);
++      } else {
++              zerrorcb = NULL;
++      }
++
++      if (zreadcb) {
++              zval_add_ref(&zreadcb);
++              
++              if (bevent->readcb) {
++                      zval_ptr_dtor(&bevent->readcb);
++              }
++              bevent->readcb = zreadcb;
++      } else {
++              if (bevent->readcb) {
++                      zval_ptr_dtor(&bevent->readcb);
++              }
++              bevent->readcb = NULL;
++      }
++
++      if (zwritecb) {
++              zval_add_ref(&zwritecb);
++              
++              if (bevent->writecb) {
++                      zval_ptr_dtor(&bevent->writecb);
++              }
++              bevent->writecb = zwritecb;
++      } else {
++              if (bevent->writecb) {
++                      zval_ptr_dtor(&bevent->writecb);
++              }
++              bevent->writecb = NULL;
++      }
++      
++      if (zerrorcb) {
++              zval_add_ref(&zerrorcb);
++              
++              if (bevent->errorcb) {
++                      zval_ptr_dtor(&bevent->errorcb);
++              }
++              bevent->errorcb = zerrorcb;
++      }
++      
++      if (zarg) {
++              zval_add_ref(&zarg);
++              if (bevent->arg) {
++                      zval_ptr_dtor(&bevent->arg);
++              }
++              bevent->arg = zarg;
++      }
++
++      RETURN_TRUE;
++}
++/* }}} */
++
++
++/* {{{ PHP_MINIT_FUNCTION
++ */
++static PHP_MINIT_FUNCTION(libevent)
++{
++      le_event_base = zend_register_list_destructors_ex(_php_event_base_dtor, NULL, "event base", module_number);
++      le_event = zend_register_list_destructors_ex(_php_event_dtor, NULL, "event", module_number);
++      le_bufferevent = zend_register_list_destructors_ex(_php_bufferevent_dtor, NULL, "buffer event", module_number);
++
++      REGISTER_LONG_CONSTANT("EV_TIMEOUT", EV_TIMEOUT, CONST_CS | CONST_PERSISTENT);
++      REGISTER_LONG_CONSTANT("EV_READ", EV_READ, CONST_CS | CONST_PERSISTENT);
++      REGISTER_LONG_CONSTANT("EV_WRITE", EV_WRITE, CONST_CS | CONST_PERSISTENT);
++      REGISTER_LONG_CONSTANT("EV_SIGNAL", EV_SIGNAL, CONST_CS | CONST_PERSISTENT);
++      REGISTER_LONG_CONSTANT("EV_PERSIST", EV_PERSIST, CONST_CS | CONST_PERSISTENT);
++      REGISTER_LONG_CONSTANT("EVLOOP_NONBLOCK", EVLOOP_NONBLOCK, CONST_CS | CONST_PERSISTENT);
++      REGISTER_LONG_CONSTANT("EVLOOP_ONCE", EVLOOP_ONCE, CONST_CS | CONST_PERSISTENT);
++      
++      REGISTER_LONG_CONSTANT("EVBUFFER_READ", EVBUFFER_READ, CONST_CS | CONST_PERSISTENT);
++      REGISTER_LONG_CONSTANT("EVBUFFER_WRITE", EVBUFFER_WRITE, CONST_CS | CONST_PERSISTENT);
++      REGISTER_LONG_CONSTANT("EVBUFFER_EOF", EVBUFFER_EOF, CONST_CS | CONST_PERSISTENT);
++      REGISTER_LONG_CONSTANT("EVBUFFER_ERROR", EVBUFFER_ERROR, CONST_CS | CONST_PERSISTENT);
++      REGISTER_LONG_CONSTANT("EVBUFFER_TIMEOUT", EVBUFFER_TIMEOUT, CONST_CS | CONST_PERSISTENT);
++
++      return SUCCESS;
++}
++/* }}} */
++
++/* {{{ PHP_MINFO_FUNCTION
++ */
++static PHP_MINFO_FUNCTION(libevent)
++{
++      char buf[64];
++
++
++      php_info_print_table_start();
++      php_info_print_table_header(2, "libevent support", "enabled");
++      php_info_print_table_row(2, "extension version", PHP_LIBEVENT_VERSION);
++      php_info_print_table_row(2, "Revision", "$Revision: 300303 $");
++      
++      snprintf(buf, sizeof(buf) - 1, "%s", event_get_version());
++      php_info_print_table_row(2, "libevent version", buf);
++
++      php_info_print_table_end();
++}
++/* }}} */
++
++#if PHP_MAJOR_VERSION >= 5
++/* {{{ arginfo */
++#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3) || PHP_MAJOR_VERSION > 5
++# define EVENT_ARGINFO
++#else
++# define EVENT_ARGINFO static
++#endif
++
++EVENT_ARGINFO
++ZEND_BEGIN_ARG_INFO_EX(arginfo_event_base_loop, 0, 0, 1)
++      ZEND_ARG_INFO(0, base)
++      ZEND_ARG_INFO(0, flags)
++ZEND_END_ARG_INFO()
++
++EVENT_ARGINFO
++ZEND_BEGIN_ARG_INFO_EX(arginfo_event_base_loopbreak, 0, 0, 1)
++      ZEND_ARG_INFO(0, base)
++ZEND_END_ARG_INFO()
++
++EVENT_ARGINFO
++ZEND_BEGIN_ARG_INFO_EX(arginfo_event_base_loopexit, 0, 0, 1)
++      ZEND_ARG_INFO(0, base)
++      ZEND_ARG_INFO(0, timeout)
++ZEND_END_ARG_INFO()
++
++EVENT_ARGINFO
++ZEND_BEGIN_ARG_INFO_EX(arginfo_event_base_set, 0, 0, 2)
++      ZEND_ARG_INFO(0, event)
++      ZEND_ARG_INFO(0, base)
++ZEND_END_ARG_INFO()
++
++EVENT_ARGINFO
++ZEND_BEGIN_ARG_INFO_EX(arginfo_event_base_priority_init, 0, 0, 2)
++      ZEND_ARG_INFO(0, base)
++      ZEND_ARG_INFO(0, npriorities)
++ZEND_END_ARG_INFO()
++
++EVENT_ARGINFO
++ZEND_BEGIN_ARG_INFO(arginfo_event_new, 0)
++ZEND_END_ARG_INFO()
++
++EVENT_ARGINFO
++ZEND_BEGIN_ARG_INFO_EX(arginfo_event_add, 0, 0, 1)
++      ZEND_ARG_INFO(0, event)
++      ZEND_ARG_INFO(0, timeout)
++ZEND_END_ARG_INFO()
++
++EVENT_ARGINFO
++ZEND_BEGIN_ARG_INFO_EX(arginfo_event_set, 0, 0, 4)
++      ZEND_ARG_INFO(0, event)
++      ZEND_ARG_INFO(0, fd)
++      ZEND_ARG_INFO(0, events)
++      ZEND_ARG_INFO(0, callback)
++      ZEND_ARG_INFO(0, arg)
++ZEND_END_ARG_INFO()
++
++EVENT_ARGINFO
++ZEND_BEGIN_ARG_INFO_EX(arginfo_event_del, 0, 0, 1)
++      ZEND_ARG_INFO(0, event)
++ZEND_END_ARG_INFO()
++
++EVENT_ARGINFO
++ZEND_BEGIN_ARG_INFO_EX(arginfo_event_buffer_new, 0, 0, 4)
++      ZEND_ARG_INFO(0, stream)
++      ZEND_ARG_INFO(0, readcb)
++      ZEND_ARG_INFO(0, writecb)
++      ZEND_ARG_INFO(0, errorcb)
++      ZEND_ARG_INFO(0, arg)
++ZEND_END_ARG_INFO()
++
++EVENT_ARGINFO
++ZEND_BEGIN_ARG_INFO_EX(arginfo_event_buffer_free, 0, 0, 1)
++      ZEND_ARG_INFO(0, bevent)
++ZEND_END_ARG_INFO()
++
++EVENT_ARGINFO
++ZEND_BEGIN_ARG_INFO_EX(arginfo_event_buffer_base_set, 0, 0, 2)
++      ZEND_ARG_INFO(0, bevent)
++      ZEND_ARG_INFO(0, base)
++ZEND_END_ARG_INFO()
++
++EVENT_ARGINFO
++ZEND_BEGIN_ARG_INFO_EX(arginfo_event_buffer_priority_set, 0, 0, 2)
++      ZEND_ARG_INFO(0, bevent)
++      ZEND_ARG_INFO(0, priority)
++ZEND_END_ARG_INFO()
++
++EVENT_ARGINFO
++ZEND_BEGIN_ARG_INFO_EX(arginfo_event_buffer_write, 0, 0, 2)
++      ZEND_ARG_INFO(0, bevent)
++      ZEND_ARG_INFO(0, data)
++      ZEND_ARG_INFO(0, data_size)
++ZEND_END_ARG_INFO()
++
++EVENT_ARGINFO
++ZEND_BEGIN_ARG_INFO_EX(arginfo_event_buffer_read, 0, 0, 2)
++      ZEND_ARG_INFO(0, bevent)
++      ZEND_ARG_INFO(0, data_size)
++ZEND_END_ARG_INFO()
++
++EVENT_ARGINFO
++ZEND_BEGIN_ARG_INFO_EX(arginfo_event_buffer_disable, 0, 0, 2)
++      ZEND_ARG_INFO(0, bevent)
++      ZEND_ARG_INFO(0, events)
++ZEND_END_ARG_INFO()
++
++EVENT_ARGINFO
++ZEND_BEGIN_ARG_INFO_EX(arginfo_event_buffer_timeout_set, 0, 0, 3)
++      ZEND_ARG_INFO(0, bevent)
++      ZEND_ARG_INFO(0, read_timeout)
++      ZEND_ARG_INFO(0, write_timeout)
++ZEND_END_ARG_INFO()
++
++EVENT_ARGINFO
++ZEND_BEGIN_ARG_INFO_EX(arginfo_event_buffer_watermark_set, 0, 0, 4)
++      ZEND_ARG_INFO(0, bevent)
++      ZEND_ARG_INFO(0, events)
++      ZEND_ARG_INFO(0, lowmark)
++      ZEND_ARG_INFO(0, highmark)
++ZEND_END_ARG_INFO()
++
++EVENT_ARGINFO
++ZEND_BEGIN_ARG_INFO_EX(arginfo_event_buffer_fd_set, 0, 0, 2)
++      ZEND_ARG_INFO(0, bevent)
++      ZEND_ARG_INFO(0, fd)
++ZEND_END_ARG_INFO()
++
++EVENT_ARGINFO
++ZEND_BEGIN_ARG_INFO_EX(arginfo_event_buffer_set_callback, 0, 0, 4)
++      ZEND_ARG_INFO(0, bevent)
++      ZEND_ARG_INFO(0, readcb)
++      ZEND_ARG_INFO(0, writecb)
++      ZEND_ARG_INFO(0, errorcb)
++      ZEND_ARG_INFO(0, arg)
++ZEND_END_ARG_INFO()
++
++EVENT_ARGINFO
++ZEND_BEGIN_ARG_INFO_EX(arginfo_event_timer_set, 0, 0, 2)
++      ZEND_ARG_INFO(0, event)
++      ZEND_ARG_INFO(0, callback)
++      ZEND_ARG_INFO(0, arg)
++ZEND_END_ARG_INFO()
++
++EVENT_ARGINFO
++ZEND_BEGIN_ARG_INFO_EX(arginfo_event_timer_pending, 0, 0, 1)
++      ZEND_ARG_INFO(0, event)
++      ZEND_ARG_INFO(0, timeout)
++ZEND_END_ARG_INFO()
++/* }}} */
++
++/* {{{ libevent_functions[]
++ */
++#if ZEND_MODULE_API_NO >= 20071006
++const 
++#endif
++zend_function_entry libevent_functions[] = {
++      PHP_FE(event_base_new,                          arginfo_event_new)
++      PHP_FE(event_base_free,                         arginfo_event_base_loopbreak)
++      PHP_FE(event_base_loop,                         arginfo_event_base_loop)
++      PHP_FE(event_base_loopbreak,            arginfo_event_base_loopbreak)
++      PHP_FE(event_base_loopexit,             arginfo_event_base_loopexit)
++      PHP_FE(event_base_set,                          arginfo_event_base_set)
++      PHP_FE(event_base_priority_init,        arginfo_event_base_priority_init)
++      PHP_FE(event_new,                                       arginfo_event_new)
++      PHP_FE(event_free,                                      arginfo_event_del)
++      PHP_FE(event_add,                                       arginfo_event_add)
++      PHP_FE(event_set,                                       arginfo_event_set)
++      PHP_FE(event_del,                                       arginfo_event_del)
++      PHP_FE(event_buffer_new,                        arginfo_event_buffer_new)
++      PHP_FE(event_buffer_free,                       arginfo_event_buffer_free)
++      PHP_FE(event_buffer_base_set,           arginfo_event_buffer_base_set)
++      PHP_FE(event_buffer_priority_set,       arginfo_event_buffer_priority_set)
++      PHP_FE(event_buffer_write,                      arginfo_event_buffer_write)
++      PHP_FE(event_buffer_read,                       arginfo_event_buffer_read)
++      PHP_FE(event_buffer_enable,             arginfo_event_buffer_disable)
++      PHP_FE(event_buffer_disable,            arginfo_event_buffer_disable)
++      PHP_FE(event_buffer_timeout_set,        arginfo_event_buffer_timeout_set)
++      PHP_FE(event_buffer_watermark_set,      arginfo_event_buffer_watermark_set)
++      PHP_FE(event_buffer_fd_set,             arginfo_event_buffer_fd_set)
++      PHP_FE(event_buffer_set_callback,       arginfo_event_buffer_set_callback)
++      PHP_FALIAS(event_timer_new,                     event_new,              arginfo_event_new)
++      PHP_FE(event_timer_set,                         arginfo_event_timer_set)
++      PHP_FE(event_timer_pending,                     arginfo_event_timer_pending)
++      PHP_FALIAS(event_timer_add,                     event_add,              arginfo_event_add)
++      PHP_FALIAS(event_timer_del,                     event_del,              arginfo_event_del)
++      {NULL, NULL, NULL}
++};
++/* }}} */
++#else
++/* {{{ libevent_functions[]
++ */
++zend_function_entry libevent_functions[] = {
++      PHP_FE(event_base_new,                          NULL)
++      PHP_FE(event_base_free,                         NULL)
++      PHP_FE(event_base_loop,                         NULL)
++      PHP_FE(event_base_loopbreak,            NULL)
++      PHP_FE(event_base_loopexit,             NULL)
++      PHP_FE(event_base_set,                          NULL)
++      PHP_FE(event_base_priority_init,        NULL)
++      PHP_FE(event_new,                                       NULL)
++      PHP_FE(event_free,                                      NULL)
++      PHP_FE(event_add,                                       NULL)
++      PHP_FE(event_set,                                       NULL)
++      PHP_FE(event_del,                                       NULL)
++      PHP_FE(event_buffer_new,                        NULL)
++      PHP_FE(event_buffer_free,                       NULL)
++      PHP_FE(event_buffer_base_set,           NULL)
++      PHP_FE(event_buffer_priority_set,       NULL)
++      PHP_FE(event_buffer_write,                      NULL)
++      PHP_FE(event_buffer_read,                       NULL)
++      PHP_FE(event_buffer_enable,             NULL)
++      PHP_FE(event_buffer_disable,            NULL)
++      PHP_FE(event_buffer_timeout_set,        NULL)
++      PHP_FE(event_buffer_watermark_set,      NULL)
++      PHP_FE(event_buffer_fd_set,             NULL)
++      PHP_FALIAS(event_timer_new,                     event_new,      NULL)
++      PHP_FE(event_timer_set,                         NULL)
++      PHP_FE(event_timer_pending,                     NULL)
++      PHP_FALIAS(event_timer_add,                     event_add,      NULL)
++      PHP_FALIAS(event_timer_del,                     event_del,      NULL)
++      {NULL, NULL, NULL}
++};
++/* }}} */
++#endif
++
++static const zend_module_dep libevent_deps[] = { /* {{{ */
++      ZEND_MOD_OPTIONAL("sockets")
++      {NULL, NULL, NULL}
++};
++/* }}} */
++
++/* {{{ libevent_module_entry
++ */
++zend_module_entry libevent_module_entry = {
++      STANDARD_MODULE_HEADER_EX,
++      NULL,
++      libevent_deps,
++      "libevent",
++      libevent_functions,
++      PHP_MINIT(libevent),
++      NULL,
++      NULL,
++      NULL,
++      PHP_MINFO(libevent),
++      PHP_LIBEVENT_VERSION,
++      STANDARD_MODULE_PROPERTIES
++};
++/* }}} */
++
++/*
++ * Local variables:
++ * tab-width: 4
++ * c-basic-offset: 4
++ * End:
++ * vim600: noet sw=4 ts=4 fdm=marker
++ * vim<600: noet sw=4 ts=4
++ */
+--- /dev/null
++++ b/ext/libevent/libevent.php
+@@ -0,0 +1,58 @@
++<?php
++
++/* poll STDIN using basic API */
++
++function foo($fd, $events, $arg)
++{
++      static $i;
++
++      $i++;
++
++      if ($i == 10) {
++              event_base_loopexit($arg[1]);
++      }
++      var_dump(fread($fd, 1000));
++}
++
++
++$base = event_base_new();
++$event = event_new();
++
++$fd = STDIN;
++
++var_dump(event_set($event, $fd, EV_READ | EV_PERSIST, "foo", array($event, $base)));
++var_dump(event_set($event, $fd, EV_READ | EV_PERSIST, "foo", array($event, $base)));
++
++event_base_set($event, $base);
++
++var_dump(event_add($event));
++var_dump(event_base_loop($base));
++
++exit;
++
++/* poll STDIN using event_buffer API */
++
++function foo2($buf, $arg)
++{
++      static $i;
++
++      $i++;
++
++      if ($i == 10) {
++              event_base_loopexit($arg);
++      }
++      var_dump($buf);
++      var_dump(event_buffer_read($buf, 10));
++}
++
++$base = event_base_new();
++$b = event_buffer_new(STDIN, "foo2", NULL, "foo2", $base);
++
++event_buffer_base_set($b, $base);
++event_buffer_enable($b, EV_READ);
++
++event_base_loop($base);
++
++
++
++?>
+--- /dev/null
++++ b/ext/libevent/php_libevent.h
+@@ -0,0 +1,68 @@
++/*
++  +----------------------------------------------------------------------+
++  | PHP Version 5                                                        |
++  +----------------------------------------------------------------------+
++  | Copyright (c) 1997-2008 The PHP Group                                |
++  +----------------------------------------------------------------------+
++  | This source file is subject to version 3.01 of the PHP license,      |
++  | that is bundled with this package in the file LICENSE, and is        |
++  | available through the world-wide-web at the following url:           |
++  | http://www.php.net/license/3_01.txt                                  |
++  | If you did not receive a copy of the PHP license and are unable to   |
++  | obtain it through the world-wide-web, please send a note to          |
++  | license@php.net so we can mail you a copy immediately.               |
++  +----------------------------------------------------------------------+
++  | Author: Antony Dovgal <tony@daylessday.org>                          |
++  |         Arnaud Le Blanc <lbarnaud@php.net>                           |
++  +----------------------------------------------------------------------+
++*/
++
++/* $Id: php_libevent.h 300687 2010-06-23 08:13:24Z tony2001 $ */
++
++#ifndef PHP_LIBEVENT_H
++#define PHP_LIBEVENT_H
++
++#define PHP_LIBEVENT_VERSION "0.0.4"
++
++extern zend_module_entry libevent_module_entry;
++#define phpext_libevent_ptr &libevent_module_entry
++
++#ifdef ZTS
++#include "TSRM.h"
++#endif
++
++#ifndef zend_always_inline
++# if defined(__GNUC__)
++#  define zend_always_inline inline __attribute__((always_inline))
++# elif defined(_MSC_VER)
++#  define zend_always_inline __forceinline
++# else
++#  define zend_always_inline inline
++# endif
++#endif
++
++#ifndef Z_ADDREF_P
++#define Z_ADDREF_P(pz)                        zval_addref_p(pz)
++static zend_always_inline zend_uint zval_addref_p(zval* pz) {
++      return ++pz->refcount;
++}
++#endif
++
++#ifndef Z_DELREF_P
++#define Z_DELREF_P(pz)                        zval_delref_p(pz)
++static zend_always_inline zend_uint zval_delref_p(zval* pz) {
++      return --pz->refcount;
++}
++#endif
++
++#endif        /* PHP_LIBEVENT_H */
++
++
++/*
++ * Local variables:
++ * tab-width: 4
++ * c-basic-offset: 4
++ * End:
++ * vim600: noet sw=4 ts=4 fdm=marker
++ * vim<600: noet sw=4 ts=4
++ */

diff --git a/lang/php5/patches/900-prevent_buildconf_force.patch b/lang/php5/patches/900-prevent_buildconf_force.patch
index ec5cd09b666a994f04d3689c98ebaaf85aa2c454..17291d5315ca6434065e916b1636a444cb1257fa 100644 (file)
--- a/lang/php5/patches/900-prevent_buildconf_force.patch
+++ b/lang/php5/patches/900-prevent_buildconf_force.patch
@@ -40,42 +40,51 @@
    --disable-dom           Disable DOM support"
  ac_help="$ac_help
    --with-libxml-dir[=DIR]   DOM: libxml2 install prefix"
-@@ -1888,12 +1914,12 @@ fi
+@@ -951,6 +977,8 @@ ac_help="$ac_help
+ ac_help="$ac_help
+   --with-ldap-sasl[=DIR]    LDAP: Include Cyrus SASL support"
+ ac_help="$ac_help
++  --with-libevent             Include libevent support"
++ac_help="$ac_help
+   --enable-mbstring       Enable multibyte string support"
+ ac_help="$ac_help
+   --disable-mbregex         MBSTRING: Disable multibyte regex support"
+@@ -1888,12 +1916,12 @@ fi
  
  
  echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
 -echo "configure:1892: checking for Cygwin environment" >&5
-+echo "configure:1918: checking for Cygwin environment" >&5
++echo "configure:1920: 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 1923 "configure"
++#line 1925 "configure"
  #include "confdefs.h"
  
  int main() {
-@@ -1904,7 +1930,7 @@ int main() {
+@@ -1904,7 +1932,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:1934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1936: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_cygwin=yes
  else
-@@ -1921,19 +1947,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
+@@ -1921,19 +1949,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:1951: checking for mingw32 environment" >&5
++echo "configure:1953: 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 1956 "configure"
++#line 1958 "configure"
  #include "confdefs.h"
  
  int main() {
@@ -83,357 +92,357 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:1937: \"$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
++if { (eval echo configure:1965: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_mingw32=yes
  else
-@@ -1952,7 +1978,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes
+@@ -1952,7 +1980,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=y
  
  
  echo $ac_n "checking for egrep""... $ac_c" 1>&6
 -echo "configure:1956: checking for egrep" >&5
-+echo "configure:1982: checking for egrep" >&5
++echo "configure:1984: 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 +1993,7 @@ echo "$ac_t""$ac_cv_prog_egrep" 1>&6
+@@ -1967,7 +1995,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:1997: checking for a sed that does not truncate output" >&5
++echo "configure:1999: 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 +2143,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+@@ -2117,7 +2145,7 @@ else { echo "configure: error: can not r
  fi
  
  echo $ac_n "checking host system type""... $ac_c" 1>&6
 -echo "configure:2121: checking host system type" >&5
-+echo "configure:2147: checking host system type" >&5
++echo "configure:2149: checking host system type" >&5
  
  host_alias=$host
  case "$host_alias" in
-@@ -2138,7 +2164,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+@@ -2138,7 +2166,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
  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:2168: checking target system type" >&5
++echo "configure:2170: checking target system type" >&5
  
  target_alias=$target
  case "$target_alias" in
-@@ -2250,7 +2276,7 @@ rm -f libs/*
+@@ -2250,7 +2278,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:2280: checking for $ac_word" >&5
++echo "configure:2282: 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 +2306,7 @@ if test -z "$CC"; then
+@@ -2280,7 +2308,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:2310: checking for $ac_word" >&5
++echo "configure:2312: 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 +2357,7 @@ fi
+@@ -2331,7 +2359,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:2361: checking for $ac_word" >&5
++echo "configure:2363: 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 +2389,7 @@ fi
+@@ -2363,7 +2391,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:2393: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:2395: 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 +2400,12 @@ cross_compiling=$ac_cv_prog_cc_cross
+@@ -2374,12 +2402,12 @@ cross_compiling=$ac_cv_prog_cc_cross
  
  cat > conftest.$ac_ext << EOF
  
 -#line 2378 "configure"
-+#line 2404 "configure"
++#line 2406 "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:2409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2411: \"$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 +2431,12 @@ if test $ac_cv_prog_cc_works = no; then
+@@ -2405,12 +2433,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:2435: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:2437: 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:2440: checking whether we are using GNU C" >&5
++echo "configure:2442: 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 +2445,7 @@ else
+@@ -2419,7 +2447,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:2449: \"$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:2451: \"$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 +2464,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
+@@ -2438,7 +2466,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:2468: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:2470: 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 +2496,7 @@ else
+@@ -2470,7 +2498,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:2500: checking how to run the C preprocessor" >&5
++echo "configure:2502: 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 +2511,13 @@ else
+@@ -2485,13 +2513,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 2515 "configure"
++#line 2517 "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:2521: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2523: \"$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 +2528,13 @@ else
+@@ -2502,13 +2530,13 @@ else
    rm -rf conftest*
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
 -#line 2506 "configure"
-+#line 2532 "configure"
++#line 2534 "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:2538: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2540: \"$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 +2545,13 @@ else
+@@ -2519,13 +2547,13 @@ else
    rm -rf conftest*
    CPP="${CC-cc} -nologo -E"
    cat > conftest.$ac_ext <<EOF
 -#line 2523 "configure"
-+#line 2549 "configure"
++#line 2551 "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:2555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2557: \"$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 +2578,9 @@ echo "$ac_t""$CPP" 1>&6
+@@ -2552,9 +2580,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:2582: checking for icc" >&5
++echo "configure:2584: checking for icc" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 2558 "configure"
-+#line 2584 "configure"
++#line 2586 "configure"
  #include "confdefs.h"
  __INTEL_COMPILER
  EOF
-@@ -2576,9 +2602,9 @@ rm -f conftest*
+@@ -2576,9 +2604,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:2606: checking for suncc" >&5
++echo "configure:2608: checking for suncc" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 2582 "configure"
-+#line 2608 "configure"
++#line 2610 "configure"
  #include "confdefs.h"
  __SUNPRO_C
  EOF
-@@ -2601,10 +2627,10 @@ rm -f conftest*
+@@ -2601,10 +2629,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:2631: checking whether $CC and cc understand -c and -o together" >&5
++echo "configure:2633: 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:2634: checking whether cc understands -c and -o together" >&5
++echo "configure:2636: 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 +2642,16 @@ else
+@@ -2616,16 +2644,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: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; };
++if { (eval echo configure:2648: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
++   test -f conftest.o && { (eval echo configure:2649: \"$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:2652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
++    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2654: \"$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: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; };
++      if { (eval echo configure:2656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
++       test -f conftest.o && { (eval echo configure:2657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
        then
          # cc works too.
          :
-@@ -2652,7 +2678,7 @@ EOF
+@@ -2652,7 +2680,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:2682: checking how to run the C preprocessor" >&5
++echo "configure:2684: 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 +2693,13 @@ else
+@@ -2667,13 +2695,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 2697 "configure"
++#line 2699 "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:2703: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2705: \"$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 +2710,13 @@ else
+@@ -2684,13 +2712,13 @@ else
    rm -rf conftest*
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
 -#line 2688 "configure"
-+#line 2714 "configure"
++#line 2716 "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:2720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2722: \"$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 +2727,13 @@ else
+@@ -2701,13 +2729,13 @@ else
    rm -rf conftest*
    CPP="${CC-cc} -nologo -E"
    cat > conftest.$ac_ext <<EOF
 -#line 2705 "configure"
-+#line 2731 "configure"
++#line 2733 "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:2737: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2739: \"$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 +2758,9 @@ fi
+@@ -2732,9 +2760,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:2762: checking for AIX" >&5
++echo "configure:2764: checking for AIX" >&5
  cat > conftest.$ac_ext <<EOF
 -#line 2738 "configure"
-+#line 2764 "configure"
++#line 2766 "configure"
  #include "confdefs.h"
  #ifdef _AIX
    yes
-@@ -2756,7 +2782,7 @@ rm -f conftest*
+@@ -2756,7 +2784,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:2786: checking whether ln -s works" >&5
++echo "configure:2788: 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 +2807,7 @@ fi
+@@ -2781,7 +2809,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:2811: checking for system library directory" >&5
++echo "configure:2813: 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 +2830,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -2804,7 +2832,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:2834: checking whether to enable runpaths" >&5
++echo "configure:2836: 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 +2851,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -2825,7 +2853,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:2855: checking if compiler supports -R" >&5
++echo "configure:2857: 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 +2859,14 @@ else
+@@ -2833,14 +2861,14 @@ else
    SAVE_LIBS=$LIBS
    LIBS="-R /usr/$PHP_LIBDIR $LIBS"
    cat > conftest.$ac_ext <<EOF
 -#line 2837 "configure"
-+#line 2863 "configure"
++#line 2865 "configure"
  #include "confdefs.h"
  
  int main() {
@@ -441,25 +450,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:2870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2872: \"$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 +2884,7 @@ if test $php_cv_cc_dashr = "yes"; then
+@@ -2858,7 +2886,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:2888: checking if compiler supports -Wl,-rpath," >&5
++echo "configure:2890: 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 +2892,14 @@ else
+@@ -2866,14 +2894,14 @@ else
      SAVE_LIBS=$LIBS
      LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS"
      cat > conftest.$ac_ext <<EOF
 -#line 2870 "configure"
-+#line 2896 "configure"
++#line 2898 "configure"
  #include "confdefs.h"
  
  int main() {
@@ -467,253 +476,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:2903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2905: \"$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 +2930,7 @@ do
+@@ -2904,7 +2932,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:2934: checking for $ac_word" >&5
++echo "configure:2936: 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 +2971,7 @@ test -n "$AWK" || AWK="bork"
+@@ -2945,7 +2973,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:2975: checking if $AWK is broken" >&5
++echo "configure:2977: 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 +2990,7 @@ do
+@@ -2964,7 +2992,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:2994: checking for $ac_word" >&5
++echo "configure:2996: 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 +3030,7 @@ test -n "$YACC" || YACC="yacc"
+@@ -3004,7 +3032,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:3034: checking for bison version" >&5
++echo "configure:3036: 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 +3068,7 @@ echo "$ac_t""$php_cv_bison_version" 1>&6
+@@ -3042,7 +3070,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:3072: checking for $ac_word" >&5
++echo "configure:3074: 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 +3096,7 @@ fi
+@@ -3070,7 +3098,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:3100: checking for re2c version" >&5
++echo "configure:3102: 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 +3135,7 @@ esac
+@@ -3109,7 +3137,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:3139: checking whether to enable computed goto gcc extension with re2c" >&5
++echo "configure:3141: 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 +3158,9 @@ if test "$PHP_RE2C_CGOTO" = "no"; then
+@@ -3132,9 +3160,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:3162: checking whether re2c -g works" >&5
++echo "configure:3164: checking whether re2c -g works" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 3138 "configure"
-+#line 3164 "configure"
++#line 3166 "configure"
  #include "confdefs.h"
  
  int main() {
-@@ -3152,7 +3178,7 @@ label2:
+@@ -3152,7 +3180,7 @@ label2:
    
  ; return 0; }
  EOF
 -if { (eval echo configure:3156: \"$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
++if { (eval echo configure:3184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      RE2C_FLAGS=""
-@@ -3218,7 +3244,7 @@ case $host_alias in
+@@ -3218,7 +3246,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:3248: checking whether $CC supports -no-cpp-precomp" >&5
++echo "configure:3250: 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 +3445,7 @@ esac
+@@ -3419,7 +3447,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:3449: checking whether to force non-PIC code in shared modules" >&5
++echo "configure:3451: 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 +3475,7 @@ esac
+@@ -3449,7 +3477,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:3479: checking whether /dev/urandom exists" >&5 
++echo "configure:3481: 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 +3536,7 @@ if test "$cross_compiling" = yes; then
+@@ -3510,7 +3538,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 3514 "configure"
-+#line 3540 "configure"
++#line 3542 "configure"
  #include "confdefs.h"
  
  #include <pthread.h>
-@@ -3528,7 +3554,7 @@ int main() {
+@@ -3528,7 +3556,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:3558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3560: \"$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 +3574,7 @@ fi
+@@ -3548,7 +3576,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:3578: checking for pthreads_cflags" >&5
++echo "configure:3580: 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 +3596,7 @@ if test "$cross_compiling" = yes; then
+@@ -3570,7 +3598,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 3574 "configure"
-+#line 3600 "configure"
++#line 3602 "configure"
  #include "confdefs.h"
  
  #include <pthread.h>
-@@ -3588,7 +3614,7 @@ int main() {
+@@ -3588,7 +3616,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:3618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3620: \"$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 +3644,7 @@ fi
+@@ -3618,7 +3646,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:3648: checking for pthreads_lib" >&5
++echo "configure:3650: 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 +3666,7 @@ if test "$cross_compiling" = yes; then
+@@ -3640,7 +3668,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 3644 "configure"
-+#line 3670 "configure"
++#line 3672 "configure"
  #include "confdefs.h"
  
  #include <pthread.h>
-@@ -3658,7 +3684,7 @@ int main() {
+@@ -3658,7 +3686,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:3688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3690: \"$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 +3815,7 @@ ext_output=$PHP_AOLSERVER
+@@ -3789,7 +3817,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:3819: checking for AOLserver support" >&5
++echo "configure:3821: checking for AOLserver support" >&5
  
  if test "$PHP_AOLSERVER" != "no"; then
    if test -d "$PHP_AOLSERVER/include"; then
-@@ -4054,7 +4080,7 @@ ext_output=$PHP_APXS
+@@ -4054,7 +4082,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:4084: checking for Apache 1.x module support via DSO through APXS" >&5
++echo "configure:4086: 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 +4411,7 @@ ext_output=$PHP_APACHE
+@@ -4385,7 +4413,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:4415: checking for Apache 1.x module support" >&5
++echo "configure:4417: checking for Apache 1.x module support" >&5
  
  if test "$PHP_SAPI" != "apache" && test "$PHP_APACHE" != "no"; then
    
-@@ -5262,7 +5288,7 @@ fi
+@@ -5262,7 +5290,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:5292: checking whether to enable Apache charset compatibility option" >&5
++echo "configure:5294: 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 +5320,7 @@ if test "$APACHE_MODULE" = "yes"; then
+@@ -5294,7 +5322,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:5324: checking whether $CC supports -rdynamic" >&5
++echo "configure:5326: 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 +5363,7 @@ if test -n "$APACHE_INSTALL"; then
+@@ -5337,7 +5365,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:5367: checking for member fd in BUFF *" >&5
++echo "configure:5369: 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 +5375,14 @@ else
+@@ -5349,14 +5377,14 @@ else
      CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE"
    fi
    cat > conftest.$ac_ext <<EOF
 -#line 5353 "configure"
-+#line 5379 "configure"
++#line 5381 "configure"
  #include "confdefs.h"
  #include <httpd.h>
  int main() {
@@ -721,79 +730,79 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:5360: \"$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
++if { (eval echo configure:5388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      ac_cv_php_fd_in_buff=yes
-@@ -5429,7 +5455,7 @@ ext_output=$PHP_APXS2FILTER
+@@ -5429,7 +5457,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:5459: checking for Apache 2.0 filter-module support via DSO through APXS" >&5
++echo "configure:5461: 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 +6344,7 @@ ext_output=$PHP_APXS2
+@@ -6318,7 +6346,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:6348: checking for Apache 2.0 handler-module support via DSO through APXS" >&5
++echo "configure:6350: 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 +7234,7 @@ ext_output=$PHP_APACHE_HOOKS
+@@ -7208,7 +7236,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:7238: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5
++echo "configure:7240: 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 +7565,7 @@ ext_output=$PHP_APACHE_HOOKS_STATIC
+@@ -7539,7 +7567,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:7569: checking for Apache 1.x (hooks) module support" >&5
++echo "configure:7571: 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 +8442,7 @@ fi
+@@ -8416,7 +8444,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:8446: checking whether to enable Apache charset compatibility option" >&5
++echo "configure:8448: 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 +8474,7 @@ if test "$APACHE_HOOKS_MODULE" = "yes"; then
+@@ -8448,7 +8476,7 @@ if test "$APACHE_HOOKS_MODULE" = "yes";
          
    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:8478: checking whether $CC supports -rdynamic" >&5
++echo "configure:8480: 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 +8517,7 @@ if test -n "$APACHE_HOOKS_INSTALL"; then
+@@ -8491,7 +8519,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:8521: checking for member fd in BUFF *" >&5
++echo "configure:8523: 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 +8529,14 @@ else
+@@ -8503,14 +8531,14 @@ else
      CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE"
    fi
    cat > conftest.$ac_ext <<EOF
 -#line 8507 "configure"
-+#line 8533 "configure"
++#line 8535 "configure"
  #include "confdefs.h"
  #include <httpd.h>
  int main() {
@@ -801,103 +810,103 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:8514: \"$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
++if { (eval echo configure:8542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      ac_cv_php_fd_in_buff=yes
-@@ -8584,7 +8610,7 @@ ext_output=$PHP_CAUDIUM
+@@ -8584,7 +8612,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:8614: checking for Caudium support" >&5
++echo "configure:8616: checking for Caudium support" >&5
  
  if test "$PHP_CAUDIUM" != "no"; then
    if test "$prefix" = "NONE"; then CPREF=/usr/local/; fi
-@@ -8654,7 +8680,7 @@ if test "$PHP_CAUDIUM" != "no"; then
+@@ -8654,7 +8682,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:8684: checking for C includes in $PIKE_C_INCLUDE" >&5
++echo "configure:8686: 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 +8969,7 @@ ext_output=$PHP_CLI
+@@ -8943,7 +8971,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:8973: checking for CLI build" >&5
++echo "configure:8975: checking for CLI build" >&5
  if test "$PHP_CLI" != "no"; then
    
    src=$abs_srcdir/sapi/cli/Makefile.frag
-@@ -8993,7 +9019,7 @@ echo "$ac_t""$PHP_CLI" 1>&6
+@@ -8993,7 +9021,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:9023: checking for Continuity support" >&5
++echo "configure:9025: 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 +9043,7 @@ if test "$PHP_CONTINUITY" != "no"; then
+@@ -9017,7 +9045,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:9047: checking for Continuity include files" >&5
++echo "configure:9049: 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 +9301,7 @@ ext_output=$PHP_EMBED
+@@ -9275,7 +9303,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:9305: checking for embedded SAPI library support" >&5
++echo "configure:9307: checking for embedded SAPI library support" >&5
  
  if test "$PHP_EMBED" != "no"; then
    case "$PHP_EMBED" in
-@@ -9534,7 +9560,7 @@ ext_output=$PHP_FPM
+@@ -9534,7 +9562,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:9564: checking for FPM build" >&5
++echo "configure:9566: checking for FPM build" >&5
  if test "$PHP_FPM" != "no"; then
    echo "$ac_t""$PHP_FPM" 1>&6
  
-@@ -9542,12 +9568,12 @@ if test "$PHP_FPM" != "no"; then
+@@ -9542,12 +9570,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:9572: checking for $ac_func" >&5
++echo "configure:9574: 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 9577 "configure"
++#line 9579 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -9570,7 +9596,7 @@ $ac_func();
+@@ -9570,7 +9598,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:9600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9602: \"$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 +9623,14 @@ done
+@@ -9597,14 +9625,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:9627: checking for library containing socket" >&5
++echo "configure:9629: 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
@@ -905,43 +914,43 @@
  ac_cv_search_socket="no"
  cat > conftest.$ac_ext <<EOF
 -#line 9608 "configure"
-+#line 9634 "configure"
++#line 9636 "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 +9641,7 @@ int main() {
+@@ -9615,7 +9643,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:9645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9647: \"$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 +9652,7 @@ rm -f conftest*
+@@ -9626,7 +9654,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 9656 "configure"
++#line 9658 "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 +9663,7 @@ int main() {
+@@ -9637,7 +9665,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:9667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9669: \"$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 +9685,14 @@ else :
+@@ -9659,14 +9687,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:9689: checking for library containing inet_addr" >&5
++echo "configure:9691: 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
@@ -949,110 +958,110 @@
  ac_cv_search_inet_addr="no"
  cat > conftest.$ac_ext <<EOF
 -#line 9670 "configure"
-+#line 9696 "configure"
++#line 9698 "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 +9703,7 @@ int main() {
+@@ -9677,7 +9705,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:9707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9709: \"$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 +9714,7 @@ rm -f conftest*
+@@ -9688,7 +9716,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 9718 "configure"
++#line 9720 "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 +9725,7 @@ int main() {
+@@ -9699,7 +9727,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:9729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9731: \"$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 +9750,17 @@ fi
+@@ -9724,17 +9752,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:9754: checking for $ac_hdr" >&5
++echo "configure:9756: 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 9759 "configure"
++#line 9761 "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:9764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:9766: \"$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 +9790,17 @@ done
+@@ -9764,17 +9792,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:9794: checking for $ac_hdr" >&5
++echo "configure:9796: 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 9799 "configure"
++#line 9801 "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:9804: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:9806: \"$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 +9830,17 @@ done
+@@ -9804,17 +9832,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:9834: checking for $ac_hdr" >&5
++echo "configure:9836: 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 9839 "configure"
++#line 9841 "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:9844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:9846: \"$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 +9869,17 @@ done
+@@ -9843,17 +9871,17 @@ done
  
    
    echo $ac_n "checking for prctl""... $ac_c" 1>&6
 -echo "configure:9847: checking for prctl" >&5
-+echo "configure:9873: checking for prctl" >&5
++echo "configure:9875: checking for prctl" >&5
  
    cat > conftest.$ac_ext <<EOF
 -#line 9850 "configure"
-+#line 9876 "configure"
++#line 9878 "configure"
  #include "confdefs.h"
   #include <sys/prctl.h> 
  int main() {
@@ -1060,20 +1069,20 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:9857: \"$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
++if { (eval echo configure:9885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      cat >> confdefs.h <<\EOF
-@@ -9876,17 +9902,17 @@ rm -f conftest*
+@@ -9876,17 +9904,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:9906: checking for clock_gettime" >&5
++echo "configure:9908: checking for clock_gettime" >&5
  
    cat > conftest.$ac_ext <<EOF
 -#line 9883 "configure"
-+#line 9909 "configure"
++#line 9911 "configure"
  #include "confdefs.h"
   #include <time.h> 
  int main() {
@@ -1081,23 +1090,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:9916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    
      have_clock_gettime=yes
-@@ -9904,20 +9930,20 @@ rm -f conftest*
+@@ -9904,20 +9932,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:9934: checking for clock_gettime in -lrt" >&5
++echo "configure:9936: checking for clock_gettime in -lrt" >&5
  
      SAVED_LIBS="$LIBS"
      LIBS="$LIBS -lrt"
  
      cat > conftest.$ac_ext <<EOF
 -#line 9914 "configure"
-+#line 9940 "configure"
++#line 9942 "configure"
  #include "confdefs.h"
   #include <time.h> 
  int main() {
@@ -1105,160 +1114,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:9947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    
        have_clock_gettime=yes
-@@ -9946,13 +9972,13 @@ EOF
+@@ -9946,13 +9974,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:9976: checking for clock_get_time" >&5
++echo "configure:9978: 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 9982 "configure"
++#line 9984 "configure"
  #include "confdefs.h"
   #include <mach/mach.h>
        #include <mach/clock.h>
-@@ -9976,7 +10002,7 @@ else
+@@ -9976,7 +10004,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:10006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10008: \"$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 +10033,10 @@ EOF
+@@ -10007,10 +10035,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:10037: checking for ptrace" >&5
++echo "configure:10039: checking for ptrace" >&5
  
    cat > conftest.$ac_ext <<EOF
 -#line 10014 "configure"
-+#line 10040 "configure"
++#line 10042 "configure"
  #include "confdefs.h"
  
      #include <sys/types.h>
-@@ -10019,7 +10045,7 @@ int main() {
+@@ -10019,7 +10047,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:10049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      have_ptrace=yes
-@@ -10037,13 +10063,13 @@ rm -f conftest*
+@@ -10037,13 +10065,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:10067: checking whether ptrace works" >&5
++echo "configure:10069: 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 10073 "configure"
++#line 10075 "configure"
  #include "confdefs.h"
  
        #include <unistd.h>
-@@ -10114,7 +10140,7 @@ else
+@@ -10114,7 +10142,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:10144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10146: \"$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 +10171,10 @@ EOF
+@@ -10145,10 +10173,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:10175: checking for mach_vm_read" >&5
++echo "configure:10177: checking for mach_vm_read" >&5
  
      cat > conftest.$ac_ext <<EOF
 -#line 10152 "configure"
-+#line 10178 "configure"
++#line 10180 "configure"
  #include "confdefs.h"
   #include <mach/mach.h>
        #include <mach/mach_vm.h>
-@@ -10159,7 +10185,7 @@ int main() {
+@@ -10159,7 +10187,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:10189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10191: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
        have_mach_vm_read=yes
-@@ -10195,13 +10221,13 @@ EOF
+@@ -10195,13 +10223,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:10225: checking for proc mem file" >&5
++echo "configure:10227: 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 10231 "configure"
++#line 10233 "configure"
  #include "confdefs.h"
  
        #define _GNU_SOURCE
-@@ -10231,7 +10257,7 @@ else
+@@ -10231,7 +10259,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:10261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10263: \"$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 +10301,9 @@ EOF
+@@ -10275,9 +10303,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:10305: checking if gcc supports __sync_bool_compare_and_swap" >&5
++echo "configure:10307: checking if gcc supports __sync_bool_compare_and_swap" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 10281 "configure"
-+#line 10307 "configure"
++#line 10309 "configure"
  #include "confdefs.h"
  
  int main() {
-@@ -10288,7 +10314,7 @@ int main() {
+@@ -10288,7 +10316,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:10318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:10320: \"$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 +10337,17 @@ rm -f conftest*
+@@ -10311,17 +10339,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:10341: checking for TCP_INFO" >&5
++echo "configure:10343: checking for TCP_INFO" >&5
  
    cat > conftest.$ac_ext <<EOF
 -#line 10318 "configure"
-+#line 10344 "configure"
++#line 10346 "configure"
  #include "confdefs.h"
   #include <netinet/tcp.h> 
  int main() {
@@ -1266,20 +1275,20 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:10325: \"$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
++if { (eval echo configure:10353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      have_lq=tcp_info
-@@ -10346,17 +10372,17 @@ EOF
+@@ -10346,17 +10374,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:10376: checking for SO_LISTENQLEN" >&5
++echo "configure:10378: checking for SO_LISTENQLEN" >&5
  
      cat > conftest.$ac_ext <<EOF
 -#line 10353 "configure"
-+#line 10379 "configure"
++#line 10381 "configure"
  #include "confdefs.h"
   #include <sys/socket.h> 
  int main() {
@@ -1287,157 +1296,157 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:10360: \"$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
++if { (eval echo configure:10388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
        have_lq=so_listenq
-@@ -10732,7 +10758,7 @@ fi
+@@ -10732,7 +10760,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:10762: checking for Zeus ISAPI support" >&5
++echo "configure:10764: 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 +11012,7 @@ fi
+@@ -10986,7 +11014,7 @@ fi
  
  
  echo $ac_n "checking for LiteSpeed support""... $ac_c" 1>&6
 -echo "configure:10990: checking for LiteSpeed support" >&5
-+echo "configure:11016: checking for LiteSpeed support" >&5
++echo "configure:11018: checking for LiteSpeed support" >&5
  
  
  php_with_litespeed=no
-@@ -11249,7 +11275,7 @@ echo "$ac_t""$PHP_LITESPEED" 1>&6
+@@ -11249,7 +11277,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:11279: checking for Milter support" >&5
++echo "configure:11281: 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 +11567,7 @@ fi
+@@ -11541,7 +11569,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:11571: checking for NSAPI support" >&5
++echo "configure:11573: 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 +11591,7 @@ if test "$PHP_NSAPI" != "no"; then
+@@ -11565,7 +11593,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:11595: checking for NSAPI include files" >&5
++echo "configure:11597: 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 +11599,17 @@ echo "configure:11569: checking for NSAPI include files" >&5
+@@ -11573,17 +11601,17 @@ echo "configure:11569: checking for NSAP
  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:11603: checking for $ac_hdr" >&5
++echo "configure:11605: 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 11608 "configure"
++#line 11610 "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:11613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:11615: \"$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 +11644,17 @@ done
+@@ -11618,17 +11646,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:11648: checking for $ac_hdr" >&5
++echo "configure:11650: 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 11653 "configure"
++#line 11655 "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:11658: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:11660: \"$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 +11927,7 @@ fi
+@@ -11901,7 +11929,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:11931: checking for PHTTPD support" >&5
++echo "configure:11933: 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 +12181,7 @@ fi
+@@ -12155,7 +12183,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:12185: checking for Pi3Web support" >&5
++echo "configure:12187: 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 +12553,7 @@ ext_output=$PHP_ROXEN
+@@ -12527,7 +12555,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:12557: checking whether Roxen module is build using ZTS" >&5
++echo "configure:12559: 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 +12574,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -12548,7 +12576,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:12578: checking for Roxen/Pike support" >&5
++echo "configure:12580: 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 +12860,7 @@ ext_output=$PHP_THTTPD
+@@ -12834,7 +12862,7 @@ ext_output=$PHP_THTTPD
  
  
  echo $ac_n "checking for thttpd""... $ac_c" 1>&6
 -echo "configure:12838: checking for thttpd" >&5
-+echo "configure:12864: checking for thttpd" >&5
++echo "configure:12866: checking for thttpd" >&5
  
  if test "$PHP_THTTPD" != "no"; then
    if test ! -d $PHP_THTTPD; then
-@@ -12867,7 +12893,7 @@ if test "$PHP_THTTPD" != "no"; then
+@@ -12867,7 +12895,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:12897: checking whether $CC supports -rdynamic" >&5
++echo "configure:12899: 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 +13129,24 @@ ext_output=$PHP_TUX
+@@ -13103,24 +13131,24 @@ ext_output=$PHP_TUX
  
  
  echo $ac_n "checking for TUX""... $ac_c" 1>&6
 -echo "configure:13107: checking for TUX" >&5
-+echo "configure:13133: checking for TUX" >&5
++echo "configure:13135: 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
@@ -1445,1444 +1454,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:13140: checking for $ac_hdr" >&5
++echo "configure:13142: 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 13145 "configure"
++#line 13147 "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:13150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:13152: \"$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 +13383,7 @@ ext_output=$PHP_WEBJAMES
+@@ -13357,7 +13385,7 @@ ext_output=$PHP_WEBJAMES
  
  
  echo $ac_n "checking for webjames""... $ac_c" 1>&6
 -echo "configure:13361: checking for webjames" >&5
-+echo "configure:13387: checking for webjames" >&5
++echo "configure:13389: checking for webjames" >&5
  
  if test "$PHP_WEBJAMES" != "no"; then
    
-@@ -13617,14 +13643,14 @@ ext_output=$PHP_CGI
+@@ -13617,14 +13645,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:13647: checking whether to build CGI binary" >&5
++echo "configure:13649: 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:13652: checking for socklen_t in sys/socket.h" >&5
++echo "configure:13654: checking for socklen_t in sys/socket.h" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 13628 "configure"
-+#line 13654 "configure"
++#line 13656 "configure"
  #include "confdefs.h"
  #include <sys/socket.h>
  EOF
-@@ -13644,9 +13670,9 @@ rm -f conftest*
+@@ -13644,9 +13672,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:13674: checking for sun_len in sys/un.h" >&5
++echo "configure:13676: checking for sun_len in sys/un.h" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 13650 "configure"
-+#line 13676 "configure"
++#line 13678 "configure"
  #include "confdefs.h"
  #include <sys/un.h>
  EOF
-@@ -13666,7 +13692,7 @@ rm -f conftest*
+@@ -13666,7 +13694,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:13696: checking whether cross-process locking is required by accept()" >&5
++echo "configure:13698: 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 +13936,7 @@ fi
+@@ -13910,7 +13938,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:13940: checking for chosen SAPI module" >&5
++echo "configure:13942: checking for chosen SAPI module" >&5
  echo "$ac_t""$PHP_SAPI" 1>&6
  
  if test "$enable_maintainer_zts" = "yes"; then
-@@ -13967,7 +13993,7 @@ fi
+@@ -13967,7 +13995,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:13997: checking for $ac_word" >&5
++echo "configure:13999: 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 +14032,7 @@ fi
+@@ -14006,7 +14034,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:14036: checking whether system uses EBCDIC" >&5
++echo "configure:14038: 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 +14043,7 @@ else
+@@ -14017,7 +14045,7 @@ else
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 14021 "configure"
-+#line 14047 "configure"
++#line 14049 "configure"
  #include "confdefs.h"
  
  int main(void) { 
-@@ -14025,7 +14051,7 @@ int main(void) {
+@@ -14025,7 +14053,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:14055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:14057: \"$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 +14079,7 @@ EOF
+@@ -14053,7 +14081,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:14083: checking whether byte ordering is bigendian" >&5
++echo "configure:14085: 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 +14089,7 @@ else
+@@ -14063,7 +14091,7 @@ else
    ac_cv_c_bigendian_php=unknown
  else
    cat > conftest.$ac_ext <<EOF
 -#line 14067 "configure"
-+#line 14093 "configure"
++#line 14095 "configure"
  #include "confdefs.h"
  
  int main(void)
-@@ -14079,7 +14105,7 @@ int main(void)
+@@ -14079,7 +14107,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:14109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:14111: \"$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 +14131,7 @@ EOF
+@@ -14105,7 +14133,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:14135: checking whether writing to stdout works" >&5
++echo "configure:14137: 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 +14142,7 @@ else
+@@ -14116,7 +14144,7 @@ else
      
  else
    cat > conftest.$ac_ext <<EOF
 -#line 14120 "configure"
-+#line 14146 "configure"
++#line 14148 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_UNISTD_H
-@@ -14134,7 +14160,7 @@ main()
+@@ -14134,7 +14162,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:14164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:14166: \"$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 +14235,12 @@ test -d /usr/ucblib &&
+@@ -14209,12 +14237,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:14239: checking for socket" >&5
++echo "configure:14241: 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 14244 "configure"
++#line 14246 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char socket(); below.  */
-@@ -14237,7 +14263,7 @@ socket();
+@@ -14237,7 +14265,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:14267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14269: \"$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 +14281,12 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
+@@ -14255,12 +14283,12 @@ if eval "test \"`echo '$ac_cv_func_'sock
  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:14285: checking for __socket" >&5
++echo "configure:14287: 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 14290 "configure"
++#line 14292 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __socket(); below.  */
-@@ -14283,7 +14309,7 @@ __socket();
+@@ -14283,7 +14311,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:14313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14315: \"$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 +14347,7 @@ EOF
+@@ -14321,7 +14349,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:14351: checking for socket in -lsocket" >&5
++echo "configure:14353: 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 +14355,7 @@ else
+@@ -14329,7 +14357,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 14333 "configure"
-+#line 14359 "configure"
++#line 14361 "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 +14366,7 @@ int main() {
+@@ -14340,7 +14368,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:14370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14372: \"$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 +14386,7 @@ else
+@@ -14360,7 +14388,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:14390: checking for __socket in -lsocket" >&5
++echo "configure:14392: 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 +14394,7 @@ else
+@@ -14368,7 +14396,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 14372 "configure"
-+#line 14398 "configure"
++#line 14400 "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 +14405,7 @@ int main() {
+@@ -14379,7 +14407,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:14409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14411: \"$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 +14437,11 @@ fi
+@@ -14411,11 +14439,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 14415 "configure"
-+#line 14441 "configure"
++#line 14443 "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:14445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:14447: \"$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 +14492,12 @@ EOF
+@@ -14466,12 +14494,12 @@ EOF
    unset found
    
    echo $ac_n "checking for socketpair""... $ac_c" 1>&6
 -echo "configure:14470: checking for socketpair" >&5
-+echo "configure:14496: checking for socketpair" >&5
++echo "configure:14498: 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 14501 "configure"
++#line 14503 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char socketpair(); below.  */
-@@ -14494,7 +14520,7 @@ socketpair();
+@@ -14494,7 +14522,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:14524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14526: \"$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 +14538,12 @@ if eval "test \"`echo '$ac_cv_func_'socketpair`\" = yes"; then
+@@ -14512,12 +14540,12 @@ if eval "test \"`echo '$ac_cv_func_'sock
  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:14542: checking for __socketpair" >&5
++echo "configure:14544: 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 14547 "configure"
++#line 14549 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __socketpair(); below.  */
-@@ -14540,7 +14566,7 @@ __socketpair();
+@@ -14540,7 +14568,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:14570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14572: \"$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 +14604,7 @@ EOF
+@@ -14578,7 +14606,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:14608: checking for socketpair in -lsocket" >&5
++echo "configure:14610: 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 +14612,7 @@ else
+@@ -14586,7 +14614,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 14590 "configure"
-+#line 14616 "configure"
++#line 14618 "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 +14623,7 @@ int main() {
+@@ -14597,7 +14625,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:14627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14629: \"$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 +14643,7 @@ else
+@@ -14617,7 +14645,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:14647: checking for __socketpair in -lsocket" >&5
++echo "configure:14649: 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 +14651,7 @@ else
+@@ -14625,7 +14653,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 14629 "configure"
-+#line 14655 "configure"
++#line 14657 "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 +14662,7 @@ int main() {
+@@ -14636,7 +14664,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:14666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14668: \"$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 +14694,11 @@ fi
+@@ -14668,11 +14696,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 14672 "configure"
-+#line 14698 "configure"
++#line 14700 "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:14702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:14704: \"$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 +14749,12 @@ EOF
+@@ -14723,12 +14751,12 @@ EOF
    unset found
    
    echo $ac_n "checking for htonl""... $ac_c" 1>&6
 -echo "configure:14727: checking for htonl" >&5
-+echo "configure:14753: checking for htonl" >&5
++echo "configure:14755: 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 14758 "configure"
++#line 14760 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char htonl(); below.  */
-@@ -14751,7 +14777,7 @@ htonl();
+@@ -14751,7 +14779,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:14781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14783: \"$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 +14795,12 @@ if eval "test \"`echo '$ac_cv_func_'htonl`\" = yes"; then
+@@ -14769,12 +14797,12 @@ if eval "test \"`echo '$ac_cv_func_'hton
  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:14799: checking for __htonl" >&5
++echo "configure:14801: 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 14804 "configure"
++#line 14806 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __htonl(); below.  */
-@@ -14797,7 +14823,7 @@ __htonl();
+@@ -14797,7 +14825,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:14827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14829: \"$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 +14861,7 @@ EOF
+@@ -14835,7 +14863,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:14865: checking for htonl in -lsocket" >&5
++echo "configure:14867: 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 +14869,7 @@ else
+@@ -14843,7 +14871,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 14847 "configure"
-+#line 14873 "configure"
++#line 14875 "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 +14880,7 @@ int main() {
+@@ -14854,7 +14882,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:14884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14886: \"$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 +14900,7 @@ else
+@@ -14874,7 +14902,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:14904: checking for __htonl in -lsocket" >&5
++echo "configure:14906: 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 +14908,7 @@ else
+@@ -14882,7 +14910,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 14886 "configure"
-+#line 14912 "configure"
++#line 14914 "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 +14919,7 @@ int main() {
+@@ -14893,7 +14921,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:14923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:14925: \"$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 +14951,11 @@ fi
+@@ -14925,11 +14953,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 14929 "configure"
-+#line 14955 "configure"
++#line 14957 "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:14959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:14961: \"$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 +15006,12 @@ EOF
+@@ -14980,12 +15008,12 @@ EOF
    unset found
    
    echo $ac_n "checking for gethostname""... $ac_c" 1>&6
 -echo "configure:14984: checking for gethostname" >&5
-+echo "configure:15010: checking for gethostname" >&5
++echo "configure:15012: 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 15015 "configure"
++#line 15017 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gethostname(); below.  */
-@@ -15008,7 +15034,7 @@ gethostname();
+@@ -15008,7 +15036,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:15038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15040: \"$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 +15052,12 @@ if eval "test \"`echo '$ac_cv_func_'gethostname`\" = yes"; then
+@@ -15026,12 +15054,12 @@ if eval "test \"`echo '$ac_cv_func_'geth
  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:15056: checking for __gethostname" >&5
++echo "configure:15058: 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 15061 "configure"
++#line 15063 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __gethostname(); below.  */
-@@ -15054,7 +15080,7 @@ __gethostname();
+@@ -15054,7 +15082,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:15084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15086: \"$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 +15118,7 @@ EOF
+@@ -15092,7 +15120,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:15122: checking for gethostname in -lnsl" >&5
++echo "configure:15124: 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 +15126,7 @@ else
+@@ -15100,7 +15128,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 15104 "configure"
-+#line 15130 "configure"
++#line 15132 "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 +15137,7 @@ int main() {
+@@ -15111,7 +15139,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:15141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15143: \"$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 +15157,7 @@ else
+@@ -15131,7 +15159,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:15161: checking for __gethostname in -lnsl" >&5
++echo "configure:15163: 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 +15165,7 @@ else
+@@ -15139,7 +15167,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 15143 "configure"
-+#line 15169 "configure"
++#line 15171 "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 +15176,7 @@ int main() {
+@@ -15150,7 +15178,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:15180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15182: \"$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 +15208,11 @@ fi
+@@ -15182,11 +15210,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 15186 "configure"
-+#line 15212 "configure"
++#line 15214 "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:15216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:15218: \"$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 +15263,12 @@ EOF
+@@ -15237,12 +15265,12 @@ EOF
    unset found
    
    echo $ac_n "checking for gethostbyaddr""... $ac_c" 1>&6
 -echo "configure:15241: checking for gethostbyaddr" >&5
-+echo "configure:15267: checking for gethostbyaddr" >&5
++echo "configure:15269: 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 15272 "configure"
++#line 15274 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gethostbyaddr(); below.  */
-@@ -15265,7 +15291,7 @@ gethostbyaddr();
+@@ -15265,7 +15293,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:15295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15297: \"$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 +15309,12 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyaddr`\" = yes"; then
+@@ -15283,12 +15311,12 @@ if eval "test \"`echo '$ac_cv_func_'geth
  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:15313: checking for __gethostbyaddr" >&5
++echo "configure:15315: 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 15318 "configure"
++#line 15320 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __gethostbyaddr(); below.  */
-@@ -15311,7 +15337,7 @@ __gethostbyaddr();
+@@ -15311,7 +15339,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:15341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15343: \"$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 +15375,7 @@ EOF
+@@ -15349,7 +15377,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:15379: checking for gethostbyaddr in -lnsl" >&5
++echo "configure:15381: 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 +15383,7 @@ else
+@@ -15357,7 +15385,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 15361 "configure"
-+#line 15387 "configure"
++#line 15389 "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 +15394,7 @@ int main() {
+@@ -15368,7 +15396,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:15398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15400: \"$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 +15414,7 @@ else
+@@ -15388,7 +15416,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:15418: checking for __gethostbyaddr in -lnsl" >&5
++echo "configure:15420: 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 +15422,7 @@ else
+@@ -15396,7 +15424,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 15400 "configure"
-+#line 15426 "configure"
++#line 15428 "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 +15433,7 @@ int main() {
+@@ -15407,7 +15435,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:15437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15439: \"$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 +15465,11 @@ fi
+@@ -15439,11 +15467,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 15443 "configure"
-+#line 15469 "configure"
++#line 15471 "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:15473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:15475: \"$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 +15520,12 @@ EOF
+@@ -15494,12 +15522,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:15524: checking for yp_get_default_domain" >&5
++echo "configure:15526: 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 15529 "configure"
++#line 15531 "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 +15548,7 @@ yp_get_default_domain();
+@@ -15522,7 +15550,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:15552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15554: \"$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 +15566,12 @@ if eval "test \"`echo '$ac_cv_func_'yp_get_default_domain`\" = yes"; then
+@@ -15540,12 +15568,12 @@ if eval "test \"`echo '$ac_cv_func_'yp_g
  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:15570: checking for __yp_get_default_domain" >&5
++echo "configure:15572: 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 15575 "configure"
++#line 15577 "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 +15594,7 @@ __yp_get_default_domain();
+@@ -15568,7 +15596,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:15598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15600: \"$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 +15632,7 @@ EOF
+@@ -15606,7 +15634,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:15636: checking for yp_get_default_domain in -lnsl" >&5
++echo "configure:15638: 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 +15640,7 @@ else
+@@ -15614,7 +15642,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 15618 "configure"
-+#line 15644 "configure"
++#line 15646 "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 +15651,7 @@ int main() {
+@@ -15625,7 +15653,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:15655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15657: \"$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 +15671,7 @@ else
+@@ -15645,7 +15673,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:15675: checking for __yp_get_default_domain in -lnsl" >&5
++echo "configure:15677: 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 +15679,7 @@ else
+@@ -15653,7 +15681,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 15657 "configure"
-+#line 15683 "configure"
++#line 15685 "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 +15690,7 @@ int main() {
+@@ -15664,7 +15692,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:15694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15696: \"$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 +15722,11 @@ fi
+@@ -15696,11 +15724,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 15700 "configure"
-+#line 15726 "configure"
++#line 15728 "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:15730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:15732: \"$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 +15778,12 @@ EOF
+@@ -15752,12 +15780,12 @@ EOF
    unset found
    
    echo $ac_n "checking for dlopen""... $ac_c" 1>&6
 -echo "configure:15756: checking for dlopen" >&5
-+echo "configure:15782: checking for dlopen" >&5
++echo "configure:15784: 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 15787 "configure"
++#line 15789 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char dlopen(); below.  */
-@@ -15780,7 +15806,7 @@ dlopen();
+@@ -15780,7 +15808,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:15810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15812: \"$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 +15824,12 @@ if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
+@@ -15798,12 +15826,12 @@ if eval "test \"`echo '$ac_cv_func_'dlop
  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:15828: checking for __dlopen" >&5
++echo "configure:15830: 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 15833 "configure"
++#line 15835 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __dlopen(); below.  */
-@@ -15826,7 +15852,7 @@ __dlopen();
+@@ -15826,7 +15854,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:15856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15858: \"$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 +15890,7 @@ EOF
+@@ -15864,7 +15892,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:15894: checking for dlopen in -ldl" >&5
++echo "configure:15896: 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 +15898,7 @@ else
+@@ -15872,7 +15900,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 15876 "configure"
-+#line 15902 "configure"
++#line 15904 "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 +15909,7 @@ int main() {
+@@ -15883,7 +15911,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:15913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15915: \"$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 +15929,7 @@ else
+@@ -15903,7 +15931,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:15933: checking for __dlopen in -ldl" >&5
++echo "configure:15935: 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 +15937,7 @@ else
+@@ -15911,7 +15939,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 15915 "configure"
-+#line 15941 "configure"
++#line 15943 "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 +15948,7 @@ int main() {
+@@ -15922,7 +15950,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:15952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:15954: \"$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 +15980,11 @@ fi
+@@ -15954,11 +15982,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 15958 "configure"
-+#line 15984 "configure"
++#line 15986 "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:15988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:15990: \"$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 +16036,7 @@ EOF
+@@ -16010,7 +16038,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:16040: checking for sin in -lm" >&5
++echo "configure:16042: 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 +16044,7 @@ else
+@@ -16018,7 +16046,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lm  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 16022 "configure"
-+#line 16048 "configure"
++#line 16050 "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 +16055,7 @@ int main() {
+@@ -16029,7 +16057,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:16059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16061: \"$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 +16089,12 @@ fi
+@@ -16063,12 +16091,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:16093: checking for inet_aton" >&5
++echo "configure:16095: 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 16098 "configure"
++#line 16100 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char inet_aton(); below.  */
-@@ -16091,7 +16117,7 @@ inet_aton();
+@@ -16091,7 +16119,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:16121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16123: \"$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 +16135,12 @@ if eval "test \"`echo '$ac_cv_func_'inet_aton`\" = yes"; then
+@@ -16109,12 +16137,12 @@ if eval "test \"`echo '$ac_cv_func_'inet
  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:16139: checking for __inet_aton" >&5
++echo "configure:16141: 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 16144 "configure"
++#line 16146 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __inet_aton(); below.  */
-@@ -16137,7 +16163,7 @@ __inet_aton();
+@@ -16137,7 +16165,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:16167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16169: \"$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 +16201,7 @@ EOF
+@@ -16175,7 +16203,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:16205: checking for inet_aton in -lresolv" >&5
++echo "configure:16207: 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 +16209,7 @@ else
+@@ -16183,7 +16211,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 16187 "configure"
-+#line 16213 "configure"
++#line 16215 "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 +16220,7 @@ int main() {
+@@ -16194,7 +16222,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:16224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16226: \"$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 +16240,7 @@ else
+@@ -16214,7 +16242,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:16244: checking for __inet_aton in -lresolv" >&5
++echo "configure:16246: 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 +16248,7 @@ else
+@@ -16222,7 +16250,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 16226 "configure"
-+#line 16252 "configure"
++#line 16254 "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 +16259,7 @@ int main() {
+@@ -16233,7 +16261,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:16263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16265: \"$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 +16291,11 @@ fi
+@@ -16265,11 +16293,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 16269 "configure"
-+#line 16295 "configure"
++#line 16297 "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:16299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:16301: \"$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 +16337,7 @@ EOF
+@@ -16311,7 +16339,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:16341: checking for inet_aton in -lbind" >&5
++echo "configure:16343: 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 +16345,7 @@ else
+@@ -16319,7 +16347,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 16323 "configure"
-+#line 16349 "configure"
++#line 16351 "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 +16356,7 @@ int main() {
+@@ -16330,7 +16358,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:16360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16362: \"$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 +16376,7 @@ else
+@@ -16350,7 +16378,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:16380: checking for __inet_aton in -lbind" >&5
++echo "configure:16382: 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 +16384,7 @@ else
+@@ -16358,7 +16386,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 16362 "configure"
-+#line 16388 "configure"
++#line 16390 "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 +16395,7 @@ int main() {
+@@ -16369,7 +16397,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:16399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16401: \"$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 +16427,11 @@ fi
+@@ -16401,11 +16429,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 16405 "configure"
-+#line 16431 "configure"
++#line 16433 "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:16435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:16437: \"$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 +16482,12 @@ EOF
+@@ -16456,12 +16484,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:16486: checking for ANSI C header files" >&5
++echo "configure:16488: 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 16491 "configure"
++#line 16493 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -16469,7 +16495,7 @@ else
+@@ -16469,7 +16497,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:16499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:16501: \"$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 +16512,7 @@ rm -f conftest*
+@@ -16486,7 +16514,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 16516 "configure"
++#line 16518 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
-@@ -16504,7 +16530,7 @@ fi
+@@ -16504,7 +16532,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 16534 "configure"
++#line 16536 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
-@@ -16525,7 +16551,7 @@ if test "$cross_compiling" = yes; then
+@@ -16525,7 +16553,7 @@ if test "$cross_compiling" = yes; then
    :
  else
    cat > conftest.$ac_ext <<EOF
 -#line 16529 "configure"
-+#line 16555 "configure"
++#line 16557 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -16536,7 +16562,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+@@ -16536,7 +16564,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
  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:16566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:16568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
-@@ -16564,12 +16590,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
+@@ -16564,12 +16592,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/di
  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:16594: checking for $ac_hdr that defines DIR" >&5
++echo "configure:16596: 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 16599 "configure"
++#line 16601 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <$ac_hdr>
-@@ -16577,7 +16603,7 @@ int main() {
+@@ -16577,7 +16605,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:16607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    eval "ac_cv_header_dirent_$ac_safe=yes"
  else
-@@ -16602,7 +16628,7 @@ done
+@@ -16602,7 +16630,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:16632: checking for opendir in -ldir" >&5
++echo "configure:16634: 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 +16636,7 @@ else
+@@ -16610,7 +16638,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ldir  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 16614 "configure"
-+#line 16640 "configure"
++#line 16642 "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 +16647,7 @@ int main() {
+@@ -16621,7 +16649,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:16651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16653: \"$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 +16669,7 @@ fi
+@@ -16643,7 +16671,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:16673: checking for opendir in -lx" >&5
++echo "configure:16675: 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 +16677,7 @@ else
+@@ -16651,7 +16679,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lx  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 16655 "configure"
-+#line 16681 "configure"
++#line 16683 "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 +16688,7 @@ int main() {
+@@ -16662,7 +16690,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:16692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16694: \"$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 +16770,17 @@ assert.h
+@@ -16744,17 +16772,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:16774: checking for $ac_hdr" >&5
++echo "configure:16776: 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 16779 "configure"
++#line 16781 "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:16784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:16786: \"$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 +16809,12 @@ done
+@@ -16783,12 +16811,12 @@ done
  
  
    echo $ac_n "checking for fopencookie""... $ac_c" 1>&6
 -echo "configure:16787: checking for fopencookie" >&5
-+echo "configure:16813: checking for fopencookie" >&5
++echo "configure:16815: 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 16818 "configure"
++#line 16820 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char fopencookie(); below.  */
-@@ -16811,7 +16837,7 @@ fopencookie();
+@@ -16811,7 +16839,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:16841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:16843: \"$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 +16859,7 @@ fi
+@@ -16833,7 +16861,7 @@ fi
  
    if test "$have_glibc_fopencookie" = "yes"; then
  cat > conftest.$ac_ext <<EOF
 -#line 16837 "configure"
-+#line 16863 "configure"
++#line 16865 "configure"
  #include "confdefs.h"
  
  #define _GNU_SOURCE
-@@ -16843,7 +16869,7 @@ int main() {
+@@ -16843,7 +16871,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:16873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16875: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    have_cookie_io_functions_t=yes
  else
-@@ -16862,7 +16888,7 @@ if test "$cross_compiling" = yes; then
+@@ -16862,7 +16890,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 16866 "configure"
-+#line 16892 "configure"
++#line 16894 "configure"
  #include "confdefs.h"
  
  #define _GNU_SOURCE
-@@ -16894,7 +16920,7 @@ main() {
+@@ -16894,7 +16922,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:16924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:16926: \"$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 +16940,7 @@ fi
+@@ -16914,7 +16942,7 @@ fi
      else
  
  cat > conftest.$ac_ext <<EOF
 -#line 16918 "configure"
-+#line 16944 "configure"
++#line 16946 "configure"
  #include "confdefs.h"
  
  #define _GNU_SOURCE
-@@ -16924,7 +16950,7 @@ int main() {
+@@ -16924,7 +16952,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:16954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:16956: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    have_IO_cookie_io_functions_t=yes
  else
-@@ -16958,7 +16984,7 @@ EOF
+@@ -16958,7 +16986,7 @@ EOF
  
  
    echo $ac_n "checking for broken getcwd""... $ac_c" 1>&6
 -echo "configure:16962: checking for broken getcwd" >&5
-+echo "configure:16988: checking for broken getcwd" >&5
++echo "configure:16990: checking for broken getcwd" >&5
    os=`uname -sr 2>/dev/null`
    case $os in
      SunOS*)
-@@ -16973,14 +16999,14 @@ EOF
+@@ -16973,14 +17001,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:17003: checking for broken libc stdio" >&5
++echo "configure:17005: 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
@@ -2890,118 +2899,118 @@
    if test "$cross_compiling" = yes; then
    cat > conftest.$ac_ext <<EOF
 -#line 16984 "configure"
-+#line 17010 "configure"
++#line 17012 "configure"
  #include "confdefs.h"
  
  #include <features.h>
-@@ -16993,7 +17019,7 @@ choke me
+@@ -16993,7 +17021,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:17023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17025: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    _cv_have_broken_glibc_fopen_append=yes
  else
-@@ -17006,7 +17032,7 @@ rm -f conftest*
+@@ -17006,7 +17034,7 @@ rm -f conftest*
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17010 "configure"
-+#line 17036 "configure"
++#line 17038 "configure"
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -17034,7 +17060,7 @@ int main(int argc, char *argv[])
+@@ -17034,7 +17062,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:17064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17066: \"$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 +17088,12 @@ EOF
+@@ -17062,12 +17090,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:17092: checking whether struct tm is in sys/time.h or time.h" >&5
++echo "configure:17094: 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 17097 "configure"
++#line 17099 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <time.h>
-@@ -17075,7 +17101,7 @@ int main() {
+@@ -17075,7 +17103,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:17105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_tm=time.h
  else
-@@ -17096,12 +17122,12 @@ EOF
+@@ -17096,12 +17124,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:17126: checking for tm_zone in struct tm" >&5
++echo "configure:17128: 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 17131 "configure"
++#line 17133 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <$ac_cv_struct_tm>
-@@ -17109,7 +17135,7 @@ int main() {
+@@ -17109,7 +17137,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:17139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_tm_zone=yes
  else
-@@ -17129,12 +17155,12 @@ EOF
+@@ -17129,12 +17157,12 @@ EOF
  
  else
    echo $ac_n "checking for tzname""... $ac_c" 1>&6
 -echo "configure:17133: checking for tzname" >&5
-+echo "configure:17159: checking for tzname" >&5
++echo "configure:17161: 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 17164 "configure"
++#line 17166 "configure"
  #include "confdefs.h"
  #include <time.h>
  #ifndef tzname /* For SGI.  */
-@@ -17144,7 +17170,7 @@ int main() {
+@@ -17144,7 +17172,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:17174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:17176: \"$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 +17194,16 @@ fi
+@@ -17168,16 +17196,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:17198: checking for missing declarations of reentrant functions" >&5
++echo "configure:17200: checking for missing declarations of reentrant functions" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 17174 "configure"
-+#line 17200 "configure"
++#line 17202 "configure"
  #include "confdefs.h"
  #include <time.h>
  int main() {
@@ -3009,16 +3018,16 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:17181: \"$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
++if { (eval echo configure:17209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      :
-@@ -17195,14 +17221,14 @@ EOF
+@@ -17195,14 +17223,14 @@ EOF
  fi
  rm -f conftest*
    cat > conftest.$ac_ext <<EOF
 -#line 17199 "configure"
-+#line 17225 "configure"
++#line 17227 "configure"
  #include "confdefs.h"
  #include <time.h>
  int main() {
@@ -3026,16 +3035,16 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:17206: \"$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
++if { (eval echo configure:17234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      :
-@@ -17220,14 +17246,14 @@ EOF
+@@ -17220,14 +17248,14 @@ EOF
  fi
  rm -f conftest*
    cat > conftest.$ac_ext <<EOF
 -#line 17224 "configure"
-+#line 17250 "configure"
++#line 17252 "configure"
  #include "confdefs.h"
  #include <time.h>
  int main() {
@@ -3043,16 +3052,16 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:17231: \"$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
++if { (eval echo configure:17259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      :
-@@ -17245,14 +17271,14 @@ EOF
+@@ -17245,14 +17273,14 @@ EOF
  fi
  rm -f conftest*
    cat > conftest.$ac_ext <<EOF
 -#line 17249 "configure"
-+#line 17275 "configure"
++#line 17277 "configure"
  #include "confdefs.h"
  #include <time.h>
  int main() {
@@ -3060,16 +3069,16 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:17256: \"$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
++if { (eval echo configure:17284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      :
-@@ -17270,14 +17296,14 @@ EOF
+@@ -17270,14 +17298,14 @@ EOF
  fi
  rm -f conftest*
    cat > conftest.$ac_ext <<EOF
 -#line 17274 "configure"
-+#line 17300 "configure"
++#line 17302 "configure"
  #include "confdefs.h"
  #include <string.h>
  int main() {
@@ -3077,19 +3086,19 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:17281: \"$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
++if { (eval echo configure:17309: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      :
-@@ -17298,16 +17324,16 @@ rm -f conftest*
+@@ -17298,16 +17326,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:17328: checking for fclose declaration" >&5
++echo "configure:17330: checking for fclose declaration" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 17304 "configure"
-+#line 17330 "configure"
++#line 17332 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  int main() {
@@ -3097,97 +3106,97 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:17311: \"$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
++if { (eval echo configure:17339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      cat >> confdefs.h <<\EOF
-@@ -17333,12 +17359,12 @@ rm -f conftest*
+@@ -17333,12 +17361,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:17363: checking for tm_gmtoff in struct tm" >&5
++echo "configure:17365: 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 17368 "configure"
++#line 17370 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <$ac_cv_struct_tm>
-@@ -17346,7 +17372,7 @@ int main() {
+@@ -17346,7 +17374,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:17376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_tm_gmtoff=yes
  else
-@@ -17369,12 +17395,12 @@ fi
+@@ -17369,12 +17397,12 @@ fi
  
  
  echo $ac_n "checking for struct flock""... $ac_c" 1>&6
 -echo "configure:17373: checking for struct flock" >&5
-+echo "configure:17399: checking for struct flock" >&5
++echo "configure:17401: 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 17404 "configure"
++#line 17406 "configure"
  #include "confdefs.h"
  
  #include <unistd.h>
-@@ -17384,7 +17410,7 @@ int main() {
+@@ -17384,7 +17412,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:17414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
            ac_cv_struct_flock=yes
-@@ -17411,12 +17437,12 @@ fi
+@@ -17411,12 +17439,12 @@ fi
  
  
  echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
 -echo "configure:17415: checking for socklen_t" >&5
-+echo "configure:17441: checking for socklen_t" >&5
++echo "configure:17443: 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 17446 "configure"
++#line 17448 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -17428,7 +17454,7 @@ socklen_t x;
+@@ -17428,7 +17456,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:17458: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
    ac_cv_socklen_t=yes
-@@ -17454,7 +17480,7 @@ fi
+@@ -17454,7 +17482,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:17484: checking size of size_t" >&5
++echo "configure:17486: 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 +17488,19 @@ else
+@@ -17462,18 +17490,19 @@ else
    ac_cv_sizeof_size_t=8
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17466 "configure"
-+#line 17492 "configure"
++#line 17494 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -3203,25 +3212,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:17504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17506: \"$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 +17520,7 @@ EOF
+@@ -17493,7 +17522,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:17524: checking size of long long" >&5
++echo "configure:17526: 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 +17528,19 @@ else
+@@ -17501,18 +17530,19 @@ else
    ac_cv_sizeof_long_long=8
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17505 "configure"
-+#line 17532 "configure"
++#line 17534 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -3237,25 +3246,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:17544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17546: \"$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 +17560,7 @@ EOF
+@@ -17532,7 +17562,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:17564: checking size of long long int" >&5
++echo "configure:17566: 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 +17568,19 @@ else
+@@ -17540,18 +17570,19 @@ else
    ac_cv_sizeof_long_long_int=8
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17544 "configure"
-+#line 17572 "configure"
++#line 17574 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -3271,25 +3280,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:17584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17586: \"$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 +17600,7 @@ EOF
+@@ -17571,7 +17602,7 @@ EOF
  
  
  echo $ac_n "checking size of long""... $ac_c" 1>&6
 -echo "configure:17575: checking size of long" >&5
-+echo "configure:17604: checking size of long" >&5
++echo "configure:17606: 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 +17608,19 @@ else
+@@ -17579,18 +17610,19 @@ else
    ac_cv_sizeof_long=8
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17583 "configure"
-+#line 17612 "configure"
++#line 17614 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -3305,25 +3314,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:17624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17626: \"$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 +17640,7 @@ EOF
+@@ -17610,7 +17642,7 @@ EOF
  
  
  echo $ac_n "checking size of int""... $ac_c" 1>&6
 -echo "configure:17614: checking size of int" >&5
-+echo "configure:17644: checking size of int" >&5
++echo "configure:17646: 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 +17648,19 @@ else
+@@ -17618,18 +17650,19 @@ else
    ac_cv_sizeof_int=4
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17622 "configure"
-+#line 17652 "configure"
++#line 17654 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -3339,418 +3348,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:17664: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17666: \"$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 +17682,7 @@ EOF
+@@ -17651,7 +17684,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:17686: checking size of intmax_t" >&5
++echo "configure:17688: 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 +17699,7 @@ else
+@@ -17668,7 +17701,7 @@ else
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17672 "configure"
-+#line 17703 "configure"
++#line 17705 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  #if STDC_HEADERS
-@@ -17692,7 +17723,7 @@ int main()
+@@ -17692,7 +17725,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:17727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17729: \"$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 +17762,7 @@ EOF
+@@ -17731,7 +17764,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:17766: checking size of ssize_t" >&5
++echo "configure:17768: 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 +17779,7 @@ else
+@@ -17748,7 +17781,7 @@ else
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17752 "configure"
-+#line 17783 "configure"
++#line 17785 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  #if STDC_HEADERS
-@@ -17772,7 +17803,7 @@ int main()
+@@ -17772,7 +17805,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:17807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17809: \"$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 +17842,7 @@ EOF
+@@ -17811,7 +17844,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:17846: checking size of ptrdiff_t" >&5
++echo "configure:17848: 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 +17859,7 @@ else
+@@ -17828,7 +17861,7 @@ else
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 17832 "configure"
-+#line 17863 "configure"
++#line 17865 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  #if STDC_HEADERS
-@@ -17852,7 +17883,7 @@ int main()
+@@ -17852,7 +17885,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:17887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:17889: \"$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 +17922,12 @@ EOF
+@@ -17891,12 +17924,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:17926: checking for st_blksize in struct stat" >&5
++echo "configure:17928: 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 17931 "configure"
++#line 17933 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -17904,7 +17935,7 @@ int main() {
+@@ -17904,7 +17937,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:17939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_st_blksize=yes
  else
-@@ -17926,12 +17957,12 @@ fi
+@@ -17926,12 +17959,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:17961: checking for st_blocks in struct stat" >&5
++echo "configure:17963: 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 17966 "configure"
++#line 17968 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -17939,7 +17970,7 @@ int main() {
+@@ -17939,7 +17972,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:17974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:17976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_st_blocks=yes
  else
-@@ -17966,12 +17997,12 @@ else
+@@ -17966,12 +17999,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:18001: checking for st_rdev in struct stat" >&5
++echo "configure:18003: 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 18006 "configure"
++#line 18008 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -17979,7 +18010,7 @@ int main() {
+@@ -17979,7 +18012,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:18014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:18016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_st_rdev=yes
  else
-@@ -18001,12 +18032,12 @@ fi
+@@ -18001,12 +18034,12 @@ fi
  
  
  echo $ac_n "checking for size_t""... $ac_c" 1>&6
 -echo "configure:18005: checking for size_t" >&5
-+echo "configure:18036: checking for size_t" >&5
++echo "configure:18038: 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 18041 "configure"
++#line 18043 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -18034,12 +18065,12 @@ EOF
+@@ -18034,12 +18067,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:18069: checking for uid_t in sys/types.h" >&5
++echo "configure:18071: 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 18074 "configure"
++#line 18076 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  EOF
-@@ -18070,12 +18101,12 @@ fi
+@@ -18070,12 +18103,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:18105: checking for struct sockaddr_storage" >&5
++echo "configure:18107: 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 18110 "configure"
++#line 18112 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/socket.h>
-@@ -18083,7 +18114,7 @@ int main() {
+@@ -18083,7 +18116,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:18118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:18120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_sockaddr_storage=yes
  else
-@@ -18104,13 +18135,13 @@ EOF
+@@ -18104,13 +18137,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:18139: checking for field sa_len in struct sockaddr" >&5
++echo "configure:18141: 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 18145 "configure"
++#line 18147 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/socket.h>
-@@ -18118,7 +18149,7 @@ int main() {
+@@ -18118,7 +18151,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:18153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:18155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_sockaddr_sa_len=yes
  else
-@@ -18141,12 +18172,12 @@ EOF
+@@ -18141,12 +18174,12 @@ EOF
  
  
  echo $ac_n "checking for IPv6 support""... $ac_c" 1>&6
 -echo "configure:18145: checking for IPv6 support" >&5
-+echo "configure:18176: checking for IPv6 support" >&5
++echo "configure:18178: 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 18181 "configure"
++#line 18183 "configure"
  #include "confdefs.h"
   #include <sys/types.h>
  #include <sys/socket.h>
-@@ -18155,7 +18186,7 @@ int main() {
+@@ -18155,7 +18188,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:18190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18192: \"$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 +18202,12 @@ echo "$ac_t""$ac_cv_ipv6_support" 1>&6
+@@ -18171,12 +18204,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:18206: checking for vprintf" >&5
++echo "configure:18208: 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 18211 "configure"
++#line 18213 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char vprintf(); below.  */
-@@ -18199,7 +18230,7 @@ vprintf();
+@@ -18199,7 +18232,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:18234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18236: \"$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 +18254,12 @@ fi
+@@ -18223,12 +18256,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:18258: checking for _doprnt" >&5
++echo "configure:18260: 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 18263 "configure"
++#line 18265 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char _doprnt(); below.  */
-@@ -18251,7 +18282,7 @@ _doprnt();
+@@ -18251,7 +18284,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:18286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18288: \"$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 +18390,12 @@ asprintf \
+@@ -18359,12 +18392,12 @@ asprintf \
  
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:18363: checking for $ac_func" >&5
-+echo "configure:18394: checking for $ac_func" >&5
++echo "configure:18396: 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 18399 "configure"
++#line 18401 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -18387,7 +18418,7 @@ $ac_func();
+@@ -18387,7 +18420,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:18422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18424: \"$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 +18449,7 @@ done
+@@ -18418,7 +18451,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:18453: checking for nanosleep in -lrt" >&5
++echo "configure:18455: 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 +18457,7 @@ else
+@@ -18426,7 +18459,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lrt  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 18430 "configure"
-+#line 18461 "configure"
++#line 18463 "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 +18468,7 @@ int main() {
+@@ -18437,7 +18470,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:18472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18474: \"$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 +18488,7 @@ else
+@@ -18457,7 +18490,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:18492: checking for __nanosleep in -lrt" >&5
++echo "configure:18494: 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 +18496,7 @@ else
+@@ -18465,7 +18498,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lrt  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 18469 "configure"
-+#line 18500 "configure"
++#line 18502 "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 +18507,7 @@ int main() {
+@@ -18476,7 +18509,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:18511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18513: \"$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 +18539,11 @@ fi
+@@ -18508,11 +18541,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18512 "configure"
-+#line 18543 "configure"
++#line 18545 "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:18547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18549: \"$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 +18587,25 @@ EOF
+@@ -18556,25 +18589,25 @@ EOF
  
  
  echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6
 -echo "configure:18560: checking for getaddrinfo" >&5
-+echo "configure:18591: checking for getaddrinfo" >&5
++echo "configure:18593: 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 18596 "configure"
++#line 18598 "configure"
  #include "confdefs.h"
  #include <netdb.h>
  int main() {
@@ -3758,89 +3767,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:18603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18605: \"$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 18609 "configure"
++#line 18611 "configure"
  #include "confdefs.h"
  
  #include <netdb.h>
-@@ -18614,7 +18645,7 @@ int main(void) {
+@@ -18614,7 +18647,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:18649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18651: \"$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 +18677,12 @@ fi
+@@ -18646,12 +18679,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:18681: checking for $ac_func" >&5
++echo "configure:18683: 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 18686 "configure"
++#line 18688 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -18674,7 +18705,7 @@ $ac_func();
+@@ -18674,7 +18707,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:18709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18711: \"$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 +18732,7 @@ done
+@@ -18701,7 +18734,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:18736: checking whether utime accepts a null argument" >&5
++echo "configure:18738: 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 +18742,7 @@ if test "$cross_compiling" = yes; then
+@@ -18711,7 +18744,7 @@ if test "$cross_compiling" = yes; then
    ac_cv_func_utime_null=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18715 "configure"
-+#line 18746 "configure"
++#line 18748 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/stat.h>
-@@ -18722,7 +18753,7 @@ exit(!(stat ("conftestdata", &s) == 0 && utime("conftestdata", (long *)0) == 0
+@@ -18722,7 +18755,7 @@ exit(!(stat ("conftestdata", &s) == 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:18757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18759: \"$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 +18779,19 @@ fi
+@@ -18748,19 +18781,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:18783: checking for working alloca.h" >&5
++echo "configure:18785: 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 18788 "configure"
++#line 18790 "configure"
  #include "confdefs.h"
  #include <alloca.h>
  int main() {
@@ -3848,284 +3857,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:18795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18797: \"$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 +18812,12 @@ EOF
+@@ -18781,12 +18814,12 @@ EOF
  fi
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
 -echo "configure:18785: checking for alloca" >&5
-+echo "configure:18816: checking for alloca" >&5
++echo "configure:18818: 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 18821 "configure"
++#line 18823 "configure"
  #include "confdefs.h"
  
  #ifdef __GNUC__
-@@ -18814,7 +18845,7 @@ int main() {
+@@ -18814,7 +18847,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:18849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18851: \"$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 +18877,12 @@ EOF
+@@ -18846,12 +18879,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:18881: checking whether alloca needs Cray hooks" >&5
++echo "configure:18883: 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 18886 "configure"
++#line 18888 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
  webecray
-@@ -18876,12 +18907,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
+@@ -18876,12 +18909,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:18911: checking for $ac_func" >&5
++echo "configure:18913: 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 18916 "configure"
++#line 18918 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -18904,7 +18935,7 @@ $ac_func();
+@@ -18904,7 +18937,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:18939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18941: \"$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 +18962,7 @@ done
+@@ -18931,7 +18964,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:18966: checking stack direction for C alloca" >&5
++echo "configure:18968: 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 +18970,7 @@ else
+@@ -18939,7 +18972,7 @@ else
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18943 "configure"
-+#line 18974 "configure"
++#line 18976 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
-@@ -18958,7 +18989,7 @@ main ()
+@@ -18958,7 +18991,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:18993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18995: \"$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 +19012,13 @@ fi
+@@ -18981,13 +19014,13 @@ fi
  
  
    echo $ac_n "checking for declared timezone""... $ac_c" 1>&6
 -echo "configure:18985: checking for declared timezone" >&5
-+echo "configure:19016: checking for declared timezone" >&5
++echo "configure:19018: 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 19022 "configure"
++#line 19024 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -19002,7 +19033,7 @@ int main() {
+@@ -19002,7 +19035,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:19037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
    ac_cv_declared_timezone=yes
-@@ -19028,7 +19059,7 @@ EOF
+@@ -19028,7 +19061,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:19063: checking for type of reentrant time-related functions" >&5
++echo "configure:19065: 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 +19070,7 @@ if test "$cross_compiling" = yes; then
+@@ -19039,7 +19072,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 19043 "configure"
-+#line 19074 "configure"
++#line 19076 "configure"
  #include "confdefs.h"
  
  #include <time.h>
-@@ -19057,7 +19088,7 @@ return (1);
+@@ -19057,7 +19090,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:19092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:19094: \"$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 +19104,7 @@ else
+@@ -19073,7 +19106,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 19077 "configure"
-+#line 19108 "configure"
++#line 19110 "configure"
  #include "confdefs.h"
  
  #include <time.h>
-@@ -19089,7 +19120,7 @@ main() {
+@@ -19089,7 +19122,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:19124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:19126: \"$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 +19158,12 @@ EOF
+@@ -19127,12 +19160,12 @@ EOF
  
  
      echo $ac_n "checking for readdir_r""... $ac_c" 1>&6
 -echo "configure:19131: checking for readdir_r" >&5
-+echo "configure:19162: checking for readdir_r" >&5
++echo "configure:19164: 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 19167 "configure"
++#line 19169 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char readdir_r(); below.  */
-@@ -19155,7 +19186,7 @@ readdir_r();
+@@ -19155,7 +19188,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:19190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:19192: \"$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 +19208,7 @@ fi
+@@ -19177,7 +19210,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:19212: checking for type of readdir_r" >&5
++echo "configure:19214: 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 +19219,7 @@ else
+@@ -19188,7 +19221,7 @@ else
     
  else
    cat > conftest.$ac_ext <<EOF
 -#line 19192 "configure"
-+#line 19223 "configure"
++#line 19225 "configure"
  #include "confdefs.h"
  
  #define _REENTRANT
-@@ -19213,7 +19244,7 @@ main() {
+@@ -19213,7 +19246,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:19248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:19250: \"$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 +19255,7 @@ else
+@@ -19224,7 +19257,7 @@ else
    rm -fr conftest*
    
        cat > conftest.$ac_ext <<EOF
 -#line 19228 "configure"
-+#line 19259 "configure"
++#line 19261 "configure"
  #include "confdefs.h"
  
  #define _REENTRANT
-@@ -19234,7 +19265,7 @@ int readdir_r(DIR *, struct dirent *);
+@@ -19234,7 +19267,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:19269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:19271: \"$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 +19307,12 @@ EOF
+@@ -19276,12 +19309,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:19311: checking for in_addr_t" >&5
++echo "configure:19313: 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 19316 "configure"
++#line 19318 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -19315,12 +19346,12 @@ fi
+@@ -19315,12 +19348,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:19350: checking for $ac_func" >&5
++echo "configure:19352: 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 19355 "configure"
++#line 19357 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -19343,7 +19374,7 @@ $ac_func();
+@@ -19343,7 +19376,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:19378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:19380: \"$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 +19402,14 @@ done
+@@ -19371,14 +19404,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:19406: checking which data struct is used by crypt_r" >&5
++echo "configure:19408: 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
@@ -4133,250 +4142,250 @@
      php_cv_crypt_r_style=none
      cat > conftest.$ac_ext <<EOF
 -#line 19382 "configure"
-+#line 19413 "configure"
++#line 19415 "configure"
  #include "confdefs.h"
  
  #define _REENTRANT 1
-@@ -19391,7 +19422,7 @@ crypt_r("passwd", "hash", &buffer);
+@@ -19391,7 +19424,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:19426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    php_cv_crypt_r_style=cryptd
  else
-@@ -19402,7 +19433,7 @@ rm -f conftest*
+@@ -19402,7 +19435,7 @@ rm -f conftest*
  
      if test "$php_cv_crypt_r_style" = "none"; then
        cat > conftest.$ac_ext <<EOF
 -#line 19406 "configure"
-+#line 19437 "configure"
++#line 19439 "configure"
  #include "confdefs.h"
  
  #define _REENTRANT 1
-@@ -19415,7 +19446,7 @@ crypt_r("passwd", "hash", &buffer);
+@@ -19415,7 +19448,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:19450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    php_cv_crypt_r_style=struct_crypt_data
  else
-@@ -19427,7 +19458,7 @@ rm -f conftest*
+@@ -19427,7 +19460,7 @@ rm -f conftest*
  
      if test "$php_cv_crypt_r_style" = "none"; then
        cat > conftest.$ac_ext <<EOF
 -#line 19431 "configure"
-+#line 19462 "configure"
++#line 19464 "configure"
  #include "confdefs.h"
  
  #define _REENTRANT 1
-@@ -19441,7 +19472,7 @@ crypt_r("passwd", "hash", &buffer);
+@@ -19441,7 +19474,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:19476: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19478: \"$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 +19531,7 @@ fi
+@@ -19500,7 +19533,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:19535: checking whether to include gcov symbols" >&5
++echo "configure:19537: 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 +19570,7 @@ if test "$PHP_GCOV" = "yes"; then
+@@ -19539,7 +19572,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:19574: checking for $ac_word" >&5
++echo "configure:19576: 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 +19599,7 @@ fi
+@@ -19568,7 +19601,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:19603: checking for $ac_word" >&5
++echo "configure:19605: 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 +19634,7 @@ fi
+@@ -19603,7 +19636,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:19638: checking for ltp version" >&5
++echo "configure:19640: 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 +19691,7 @@ fi
+@@ -19660,7 +19693,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:19695: checking whether to include debugging symbols" >&5
++echo "configure:19697: 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 +19739,7 @@ fi
+@@ -19708,7 +19741,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:19743: checking layout of installed files" >&5
++echo "configure:19745: 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 +19771,7 @@ esac
+@@ -19740,7 +19773,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:19775: checking path to configuration file" >&5
++echo "configure:19777: 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 +19802,7 @@ if test "$PHP_CONFIG_FILE_PATH" = "DEFAULT"; then
+@@ -19771,7 +19804,7 @@ if test "$PHP_CONFIG_FILE_PATH" = "DEFAU
  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:19806: checking where to scan for configuration files" >&5
++echo "configure:19808: checking where to scan for configuration files" >&5
  
  php_with_config_file_scan_dir=DEFAULT
  
-@@ -19804,7 +19835,7 @@ test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
+@@ -19804,7 +19837,7 @@ test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLA
  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:19839: checking whether to enable safe mode by default" >&5
++echo "configure:19841: 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 +19867,7 @@ EOF
+@@ -19836,7 +19869,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:19871: checking for safe mode exec dir" >&5
++echo "configure:19873: checking for safe mode exec dir" >&5
  
  php_with_exec_dir=no
  
-@@ -19877,7 +19908,7 @@ fi
+@@ -19877,7 +19910,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:19912: checking whether to enable PHP's own SIGCHLD handler" >&5
++echo "configure:19914: 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 +19943,7 @@ fi
+@@ -19912,7 +19945,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:19947: checking whether to enable magic quotes by default" >&5
++echo "configure:19949: 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 +19978,7 @@ fi
+@@ -19947,7 +19980,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:19982: checking whether to explicitly link against libgcc" >&5
++echo "configure:19984: 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 +20055,7 @@ fi
+@@ -20024,7 +20057,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:20059: checking whether to enable short tags by default" >&5
++echo "configure:20061: 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 +20090,7 @@ fi
+@@ -20059,7 +20092,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:20094: checking whether to enable dmalloc" >&5
++echo "configure:20096: 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 +20111,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -20080,7 +20113,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:20115: checking for dmalloc_error in -ldmalloc" >&5
++echo "configure:20117: 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 +20119,7 @@ else
+@@ -20088,7 +20121,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ldmalloc  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 20092 "configure"
-+#line 20123 "configure"
++#line 20125 "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 +20130,7 @@ int main() {
+@@ -20099,7 +20132,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:20134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:20136: \"$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 +20175,7 @@ fi
+@@ -20144,7 +20177,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:20179: checking whether to enable IPv6 support" >&5
++echo "configure:20181: 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 +20202,7 @@ EOF
+@@ -20171,7 +20204,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:20206: checking how big to make fd sets" >&5
++echo "configure:20208: checking how big to make fd sets" >&5
  
  php_enable_fd_setsize=no
  
-@@ -20239,7 +20270,7 @@ fi
+@@ -20239,7 +20272,7 @@ fi
  
  
  echo $ac_n "checking size of long""... $ac_c" 1>&6
 -echo "configure:20243: checking size of long" >&5
-+echo "configure:20274: checking size of long" >&5
++echo "configure:20276: 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 +20278,19 @@ else
+@@ -20247,18 +20280,19 @@ else
    ac_cv_sizeof_long=8
  else
    cat > conftest.$ac_ext <<EOF
 -#line 20251 "configure"
-+#line 20282 "configure"
++#line 20284 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -4392,25 +4401,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:20294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:20296: \"$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 +20310,7 @@ EOF
+@@ -20278,7 +20312,7 @@ EOF
  
  
  echo $ac_n "checking size of int""... $ac_c" 1>&6
 -echo "configure:20282: checking size of int" >&5
-+echo "configure:20314: checking size of int" >&5
++echo "configure:20316: 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 +20318,19 @@ else
+@@ -20286,18 +20320,19 @@ else
    ac_cv_sizeof_int=4
  else
    cat > conftest.$ac_ext <<EOF
 -#line 20290 "configure"
-+#line 20322 "configure"
++#line 20324 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -4426,639 +4435,743 @@
  }
  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:20334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:20336: \"$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 +20351,13 @@ EOF
+@@ -20318,13 +20353,13 @@ EOF
  
  
  echo $ac_n "checking for int32_t""... $ac_c" 1>&6
 -echo "configure:20322: checking for int32_t" >&5
-+echo "configure:20355: checking for int32_t" >&5
++echo "configure:20357: 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 20361 "configure"
++#line 20363 "configure"
  #include "confdefs.h"
  
  #if HAVE_SYS_TYPES_H
-@@ -20343,7 +20376,7 @@ if (sizeof (int32_t))
+@@ -20343,7 +20378,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:20380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:20382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_int_type_int32_t=yes
  else
-@@ -20366,13 +20399,13 @@ fi
+@@ -20366,13 +20401,13 @@ fi
  
  
  echo $ac_n "checking for uint32_t""... $ac_c" 1>&6
 -echo "configure:20370: checking for uint32_t" >&5
-+echo "configure:20403: checking for uint32_t" >&5
++echo "configure:20405: 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 20409 "configure"
++#line 20411 "configure"
  #include "confdefs.h"
  
  #if HAVE_SYS_TYPES_H
-@@ -20391,7 +20424,7 @@ if (sizeof (uint32_t))
+@@ -20391,7 +20426,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:20428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:20430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_int_type_uint32_t=yes
  else
-@@ -20423,17 +20456,17 @@ stdlib.h
+@@ -20423,17 +20458,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:20460: checking for $ac_hdr" >&5
++echo "configure:20462: 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 20465 "configure"
++#line 20467 "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:20470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:20472: \"$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 +20496,12 @@ done
+@@ -20463,12 +20498,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:20500: checking for $ac_func" >&5
++echo "configure:20502: 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 20505 "configure"
++#line 20507 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -20491,7 +20524,7 @@ $ac_func();
+@@ -20491,7 +20526,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:20528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:20530: \"$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 +20986,7 @@ case $PHP_REGEX in
+@@ -20953,7 +20988,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:20990: checking which regex library to use" >&5
++echo "configure:20992: checking which regex library to use" >&5
  echo "$ac_t""$REGEX_TYPE" 1>&6
  
  if test "$REGEX_TYPE" = "php"; then
-@@ -21330,13 +21363,13 @@ elif test "$REGEX_TYPE" = "system"; then
+@@ -21330,13 +21365,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:21367: checking whether field re_magic exists in struct regex_t" >&5
++echo "configure:21369: 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 21373 "configure"
++#line 21375 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <regex.h>
-@@ -21344,7 +21377,7 @@ int main() {
+@@ -21344,7 +21379,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:21381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:21383: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_regex_t_re_magic=yes
  else
-@@ -21370,7 +21403,7 @@ fi
+@@ -21370,7 +21405,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:21407: checking whether to enable LIBXML support" >&5
++echo "configure:21409: 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 +21448,7 @@ if test -z "$PHP_LIBXML_DIR"; then
+@@ -21415,7 +21450,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:21452: checking libxml2 install dir" >&5
++echo "configure:21454: 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 +21474,7 @@ if test "$PHP_LIBXML" != "no"; then
+@@ -21441,7 +21476,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:21478: checking for xml2-config path" >&5
++echo "configure:21480: 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 +21632,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
+@@ -21599,7 +21634,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
  
  
              echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
 -echo "configure:21603: checking whether libxml build works" >&5
-+echo "configure:21636: checking whether libxml build works" >&5
++echo "configure:21638: 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 +21648,7 @@ else
+@@ -21615,7 +21650,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 21619 "configure"
-+#line 21652 "configure"
++#line 21654 "configure"
  #include "confdefs.h"
  
      
-@@ -21626,7 +21659,7 @@ else
+@@ -21626,7 +21661,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:21663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:21665: \"$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 +22024,7 @@ fi
+@@ -21991,7 +22026,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:22028: checking for OpenSSL support" >&5
++echo "configure:22030: 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 +22068,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -22035,7 +22070,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:22072: checking for Kerberos support" >&5
++echo "configure:22074: 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 +22394,7 @@ EOF
+@@ -22361,7 +22396,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:22398: checking for $ac_word" >&5
++echo "configure:22400: 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 +22754,7 @@ fi
+@@ -22721,7 +22756,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:22758: checking for DSA_get_default_method in -lssl" >&5
++echo "configure:22760: 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 +22762,7 @@ else
+@@ -22729,7 +22764,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lssl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 22733 "configure"
-+#line 22766 "configure"
++#line 22768 "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 +22773,7 @@ int main() {
+@@ -22740,7 +22775,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:22777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:22779: \"$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 +22815,7 @@ fi
+@@ -22782,7 +22817,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:22819: checking for $ac_word" >&5
++echo "configure:22821: 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 +23020,9 @@ fi
+@@ -22987,9 +23022,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:23024: checking for OpenSSL version" >&5
++echo "configure:23026: checking for OpenSSL version" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 22993 "configure"
-+#line 23026 "configure"
++#line 23028 "configure"
  #include "confdefs.h"
  
  #include <openssl/opensslv.h>
-@@ -23144,7 +23177,7 @@ rm -f conftest*
+@@ -23144,7 +23179,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:23181: checking for CRYPTO_free in -lcrypto" >&5
++echo "configure:23183: 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 +23185,7 @@ else
+@@ -23152,7 +23187,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lcrypto  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 23156 "configure"
-+#line 23189 "configure"
++#line 23191 "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 +23196,7 @@ int main() {
+@@ -23163,7 +23198,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:23200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:23202: \"$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 +23353,7 @@ fi
+@@ -23320,7 +23355,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:23357: checking for SSL_CTX_set_ssl_version in -lssl" >&5
++echo "configure:23359: 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 +23361,7 @@ else
+@@ -23328,7 +23363,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lssl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 23332 "configure"
-+#line 23365 "configure"
++#line 23367 "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 +23372,7 @@ int main() {
+@@ -23339,7 +23374,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:23376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:23378: \"$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 +23514,7 @@ ext_output=$PHP_PCRE_REGEX
+@@ -23481,7 +23516,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:23518: checking for PCRE headers location" >&5
++echo "configure:23520: 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 +23525,7 @@ echo "configure:23485: checking for PCRE headers location" >&5
+@@ -23492,7 +23527,7 @@ echo "configure:23485: checking for PCRE
      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:23529: checking for PCRE library location" >&5
++echo "configure:23531: 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 +23947,7 @@ EOF
+@@ -23914,7 +23949,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:23951: checking for PCRE library to use" >&5
++echo "configure:23953: 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 +24284,7 @@ EOF
+@@ -24251,7 +24286,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:24288: checking whether to enable the SQLite3 extension" >&5
++echo "configure:24290: 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 +24339,7 @@ if test $PHP_SQLITE3 != "no"; then
+@@ -24306,7 +24341,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:24343: checking for sqlite3 files in default path" >&5
++echo "configure:24345: 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 +24354,7 @@ echo "configure:24310: checking for sqlite3 files in default path" >&5
+@@ -24321,7 +24356,7 @@ echo "configure:24310: checking for sqli
      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:24358: checking for SQLite 3.3.9+" >&5
++echo "configure:24360: checking for SQLite 3.3.9+" >&5
      
    save_old_LDFLAGS=$LDFLAGS
    ac_stuff="
-@@ -24420,7 +24453,7 @@ echo "configure:24325: checking for SQLite 3.3.9+" >&5
+@@ -24420,7 +24455,7 @@ echo "configure:24325: checking for SQLi
    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:24457: checking for sqlite3_prepare_v2 in -lsqlite3" >&5
++echo "configure:24459: 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 +24461,7 @@ else
+@@ -24428,7 +24463,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsqlite3  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 24432 "configure"
-+#line 24465 "configure"
++#line 24467 "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 +24472,7 @@ int main() {
+@@ -24439,7 +24474,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:24476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:24478: \"$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 +24732,7 @@ fi
+@@ -24699,7 +24734,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:24736: checking for sqlite3_key in -lsqlite3" >&5
++echo "configure:24738: 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 +24740,7 @@ else
+@@ -24707,7 +24742,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsqlite3  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 24711 "configure"
-+#line 24744 "configure"
++#line 24746 "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 +24751,7 @@ int main() {
+@@ -24718,7 +24753,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:24755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:24757: \"$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 +24883,7 @@ fi
+@@ -24850,7 +24885,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:24887: checking for sqlite3_load_extension in -lsqlite3" >&5
++echo "configure:24889: 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 +24891,7 @@ else
+@@ -24858,7 +24893,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsqlite3  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 24862 "configure"
-+#line 24895 "configure"
++#line 24897 "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 +24902,7 @@ int main() {
+@@ -24869,7 +24904,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:24906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:24908: \"$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 +24939,7 @@ fi
+@@ -24906,7 +24941,7 @@ fi
  
    else
      echo $ac_n "checking bundled sqlite3 library""... $ac_c" 1>&6
 -echo "configure:24910: checking bundled sqlite3 library" >&5
-+echo "configure:24943: checking bundled sqlite3 library" >&5
++echo "configure:24945: checking bundled sqlite3 library" >&5
      echo "$ac_t""yes" 1>&6
  
      sqlite3_extra_sources="libsqlite/sqlite3.c"
-@@ -25262,7 +25295,7 @@ fi
+@@ -25262,7 +25297,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:25299: checking for ZLIB support" >&5
++echo "configure:25301: 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 +25339,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -25306,7 +25341,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:25343: checking if the location of ZLIB install directory is defined" >&5
++echo "configure:25345: 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 +25782,7 @@ EOF
+@@ -25749,7 +25784,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:25786: checking for gzgets in -lz" >&5
++echo "configure:25788: 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 +25790,7 @@ else
+@@ -25757,7 +25792,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lz  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 25761 "configure"
-+#line 25794 "configure"
++#line 25796 "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 +25801,7 @@ int main() {
+@@ -25768,7 +25803,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:25805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:25807: \"$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 +25938,999 @@ fi
+@@ -25905,18 +25940,18 @@ fi
  
  
  
+-php_enable_bcmath=no
 +php_enable_apc=no
-+
+ 
+-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
+-# Check whether --enable-bcmath or --disable-bcmath was given.
+-if test "${enable_bcmath+set}" = set; then
+-  enableval="$enable_bcmath"
+-  PHP_BCMATH=$enableval
 +echo $ac_n "checking whether to enable APC support""... $ac_c" 1>&6
-+echo "configure:25945: checking whether to enable APC support" >&5
++echo "configure:25947: 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"
 +  PHP_APC=$enableval
-+else
-+  
+ else
+   
+-  PHP_BCMATH=no
+-  test "$PHP_ENABLE_ALL" && PHP_BCMATH=$PHP_ENABLE_ALL
 +  PHP_APC=no
 +  test "$PHP_ENABLE_ALL" && PHP_APC=$PHP_ENABLE_ALL
-+
-+fi
-+
-+
-+
-+ext_output="yes, shared"
-+ext_shared=yes
+ 
+ fi
+ 
+@@ -25924,12 +25959,12 @@ fi
+ 
+ ext_output="yes, shared"
+ ext_shared=yes
+-case $PHP_BCMATH in
 +case $PHP_APC in
-+shared,*)
+ shared,*)
+-  PHP_BCMATH=`echo "$PHP_BCMATH"|$SED 's/^shared,//'`
 +  PHP_APC=`echo "$PHP_APC"|$SED 's/^shared,//'`
-+  ;;
-+shared)
+   ;;
+ shared)
+-  PHP_BCMATH=yes
 +  PHP_APC=yes
-+  ;;
-+no)
-+  ext_output=no
-+  ext_shared=no
-+  ;;
-+*)
-+  ext_output=yes
-+  ext_shared=no
-+  ;;
-+esac
-+
-+
-+
-+echo "$ac_t""$ext_output" 1>&6
-+
-+
-+
-+
+   ;;
+ no)
+   ext_output=no
+@@ -25948,346 +25983,1335 @@ echo "$ac_t""$ext_output" 1>&6
+ 
+ 
+ 
+-if test "$PHP_BCMATH" != "no"; then
 +# Check whether --enable-apc-debug or --disable-apc-debug was given.
 +if test "${enable_apc_debug+set}" = set; then
 +  enableval="$enable_apc_debug"
-+  
+   
+-  ext_builddir=ext/bcmath
+-  ext_srcdir=$abs_srcdir/ext/bcmath
+-
+-  ac_extra=`echo "-I@ext_srcdir@/libbcmath/src"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
 +  PHP_APC_DEBUG=yes
-+
+ 
+-  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
+-    PHP_BCMATH_SHARED=no
+-    
 +else
-+  
+   
+-  case ext/bcmath in
+-  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+-  /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+-  *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
+-  esac
 +  PHP_APC_DEBUG=no
 +
 +fi
 +
 +
 +echo $ac_n "checking whether we should enable cache request file info""... $ac_c" 1>&6
-+echo "configure:25999: checking whether we should enable cache request file info" >&5
++echo "configure:26001: 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"
-+  
+   
 +  PHP_APC_FILEHITS=$enableval
 +      echo "$ac_t""$enableval" 1>&6
 +
 +else
-+  
+   
 +  PHP_APC_FILEHITS=no
 +      echo "$ac_t""no" 1>&6
-+
+ 
+-  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
 +fi
-+
-+
+ 
+ 
+-  old_IFS=$IFS
+-  for ac_src in bcmath.c \
+-libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
+-libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
+-libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
+-libbcmath/src/rmzero.c libbcmath/src/str2num.c; do
 +echo $ac_n "checking whether we should use mmap""... $ac_c" 1>&6
-+echo "configure:26016: checking whether we should use mmap" >&5
++echo "configure:26018: 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"
-+  
+   
+-      IFS=.
+-      set $ac_src
+-      ac_obj=$1
+-      IFS=$old_IFS
+-      
+-      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
 +  PHP_APC_MMAP=$enableval
 +  echo "$ac_t""$enableval" 1>&6
-+
+ 
+-      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
 +else
 +  
 +  PHP_APC_MMAP=yes
 +  echo "$ac_t""yes" 1>&6
-+
+ 
+-    cat >>Makefile.objects<<EOF
+-$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
+-      $ac_comp
+-EOF
+-  done
 +fi
-+
-+
+ 
+ 
+-    EXT_STATIC="$EXT_STATIC bcmath"
+-    if test "$ext_shared" != "nocli"; then
+-      EXT_CLI_STATIC="$EXT_CLI_STATIC bcmath"
+-    fi
+-  else
+-    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
+-      PHP_BCMATH_SHARED=yes
+-      
+-  case ext/bcmath in
+-  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+-  /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+-  *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
+-  esac
 +echo $ac_n "checking whether we should use semaphore locking instead of fcntl""... $ac_c" 1>&6
-+echo "configure:26033: checking whether we should use semaphore locking instead of fcntl" >&5
++echo "configure:26035: 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"
-+  
+   
 +  PHP_APC_SEM=$enableval
 +  echo "$ac_t""$enableval" 1>&6
 +
 +else
-+  
+   
 +  PHP_APC_SEM=no
 +  echo "$ac_t""no" 1>&6
-+
+ 
+-  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
 +fi
-+
-+
+ 
+ 
+-  old_IFS=$IFS
+-  for ac_src in bcmath.c \
+-libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
+-libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
+-libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
+-libbcmath/src/rmzero.c libbcmath/src/str2num.c; do
 +echo $ac_n "checking whether we should use pthread mutex locking""... $ac_c" 1>&6
-+echo "configure:26050: checking whether we should use pthread mutex locking" >&5
++echo "configure:26052: 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"
-+  
+   
+-      IFS=.
+-      set $ac_src
+-      ac_obj=$1
+-      IFS=$old_IFS
+-      
+-      shared_objects_bcmath="$shared_objects_bcmath $ac_bdir$ac_obj.lo"
 +  PHP_APC_PTHREADMUTEX=$enableval
 +  echo "$ac_t""$enableval" 1>&6
-+
+ 
+-      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
 +else
 +  
 +  PHP_APC_PTHREADMUTEX=yes
 +  echo "$ac_t""yes" 1>&6
-+
+ 
+-    cat >>Makefile.objects<<EOF
+-$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
+-      $ac_comp
+-EOF
+-  done
 +fi
-+
-+
+ 
+-      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'/phpbcmath.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) $(PHPBCMATH_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpbcmath.so '$ext_builddir'/phpbcmath.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_bcmath) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPBCMATH, 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_bcmath) $(PHPBCMATH_SHARED_LIBADD)'
+-      ;;
 +if test "$PHP_APC_PTHREADMUTEX" != "no"; then
 +      orig_LIBS="$LIBS"
 +      LIBS="$LIBS -lpthread"
@@ -5071,14 +5184,19 @@
 +  *) 
 +      LIBS="-lpthread $LIBS" 
 +   ;;
-+  esac
-+
+   esac
+ 
+-  if test "x" = "xyes"; then
+-    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpbcmath.$suffix"
+-  else
+-    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpbcmath.$suffix"
+-  fi
 +
 +                      
 +      
 +else
 +  cat > conftest.$ac_ext <<EOF
-+#line 26085 "configure"
++#line 26087 "configure"
 +#include "confdefs.h"
 +
 +                              #include <sys/types.h>
@@ -5113,18 +5231,24 @@
 +                                }
 +                      
 +EOF
-+if { (eval echo configure:26120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:26122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 +then
 +                              
-+  
+   
+-  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath"
 +  case pthread in
 +  c|c_r|pthread*) ;;
 +  *) 
 +      LIBS="-lpthread $LIBS" 
 +   ;;
 +  esac
-+
-+
+ 
+-  cat >>Makefile.objects<<EOF
+-\$(phplibdir)/phpbcmath.$suffix: $ext_builddir/phpbcmath.$suffix
+-      \$(LIBTOOL) --mode=install cp $ext_builddir/phpbcmath.$suffix \$(phplibdir)
+ 
+-$ext_builddir/phpbcmath.$suffix: \$(shared_objects_bcmath) \$(PHPBCMATH_SHARED_DEPENDENCIES)
+-      $link_cmd
 +                      
 +else
 +  echo "configure: failed program was:" >&5
@@ -5136,66 +5260,135 @@
 +fi
 +rm -fr conftest*
 +fi
-+
+ 
+-EOF
 +      LIBS="$orig_LIBS"
 +fi
-+
+ 
+-          ;;
+-        *)
+-          
+-  install_modules="install-modules"
 +echo $ac_n "checking whether we should use spin locks""... $ac_c" 1>&6
-+echo "configure:26148: checking whether we should use spin locks" >&5
++echo "configure:26150: 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"
 +  
 +  PHP_APC_SPINLOCKS=$enableval
 +  echo "$ac_t""$enableval" 1>&6
-+
+ 
+-  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'/bcmath.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) $(BCMATH_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/bcmath.so '$ext_builddir'/bcmath.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_bcmath) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(BCMATH, 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_bcmath) $(BCMATH_SHARED_LIBADD)'
+-      ;;
+-  esac
 +else
 +  
 +  PHP_APC_SPINLOCKS=no
 +  echo "$ac_t""no" 1>&6
-+
+ 
+-  if test "x" = "xyes"; then
+-    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/bcmath.$suffix"
+-  else
+-    PHP_MODULES="$PHP_MODULES \$(phplibdir)/bcmath.$suffix"
+-  fi
 +fi
 +
 +
 +echo $ac_n "checking whether we should enable memory protection""... $ac_c" 1>&6
-+echo "configure:26165: checking whether we should enable memory protection" >&5
++echo "configure:26167: 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"
-+  
+   
+-  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath"
 +  PHP_APC_MEMPROTECT=$enableval
 +  echo "$ac_t""$enableval" 1>&6
-+
+ 
+-  cat >>Makefile.objects<<EOF
+-\$(phplibdir)/bcmath.$suffix: $ext_builddir/bcmath.$suffix
+-      \$(LIBTOOL) --mode=install cp $ext_builddir/bcmath.$suffix \$(phplibdir)
 +else
 +  
 +  PHP_APC_MEMPROTECT=no
 +  echo "$ac_t""no" 1>&6
-+
+ 
+-$ext_builddir/bcmath.$suffix: \$(shared_objects_bcmath) \$(BCMATH_SHARED_DEPENDENCIES)
+-      $link_cmd
 +fi
-+
+ 
 +
 +if test "$PHP_APC" != "no"; then
 +  test "$PHP_APC_MMAP" != "no" && cat >> confdefs.h <<\EOF
 +#define APC_MMAP 1
-+EOF
-+
+ EOF
+ 
+-          ;;
+-      esac
+-      cat >> confdefs.h <<EOF
+-#define COMPILE_DL_BCMATH 1
 +  test "$PHP_APC_FILEHITS" != "no" && cat >> confdefs.h <<\EOF
 +#define APC_FILEHITS 1
-+EOF
-+
-+
+ EOF
+ 
+-    fi
+-  fi
+ 
+-  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
+-    PHP_BCMATH_SHARED=no
+-    case "$PHP_SAPI" in
+-      cgi|embed)
+-        
+-  
+-  case ext/bcmath in
+-  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+-  /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+-  *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
+-  esac
+-  
+-  
 +      if test "$PHP_APC_DEBUG" != "no"; then
 +              cat >> confdefs.h <<\EOF
 +#define __DEBUG_APC__ 1
 +EOF
-+
+ 
+-  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
 +      fi
-+
+ 
 +      if test "$PHP_APC_SEM" != "no"; then
 +              cat >> confdefs.h <<\EOF
 +#define APC_SEM_LOCKS 1
 +EOF
-+
+ 
+-  old_IFS=$IFS
+-  for ac_src in bcmath.c \
+-libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
+-libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
+-libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
+-libbcmath/src/rmzero.c libbcmath/src/str2num.c; do
+-  
+-      IFS=.
+-      set $ac_src
+-      ac_obj=$1
+-      IFS=$old_IFS
+-      
+-      PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo"
 +      elif test "$PHP_APC_SPINLOCKS" != "no"; then
 +              cat >> confdefs.h <<\EOF
 +#define APC_SPIN_LOCKS 1
@@ -5205,31 +5398,50 @@
 +              cat >> confdefs.h <<\EOF
 +#define APC_PTHREADMUTEX_LOCKS 1
 +EOF
-+
+ 
+-      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
 +      else 
 +              cat >> confdefs.h <<\EOF
 +#define APC_FCNTL_LOCKS 1
 +EOF
-+
+ 
+-    cat >>Makefile.objects<<EOF
+-$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
+-      $ac_comp
 +      fi
 +  
 +      if test "$PHP_APC_MEMPROTECT" != "no"; then
 +              cat >> confdefs.h <<\EOF
 +#define APC_MEMPROTECT 1
-+EOF
-+
+ EOF
+-  done
+ 
 +      fi
-+
+ 
+-        EXT_STATIC="$EXT_STATIC bcmath"
+-        ;;
+-      *)
+-        
 +  echo $ac_n "checking for zend_set_lookup_function_hook""... $ac_c" 1>&6
-+echo "configure:26228: checking for zend_set_lookup_function_hook" >&5
++echo "configure:26230: 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
-+  
+   
+-  case ext/bcmath in
+-  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+-  /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+-  *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
+-  esac
 +    orig_cflags=$CFLAGS
 +    CFLAGS="$INCLUDES $EXTRA_INCLUDES"
 +    cat > conftest.$ac_ext <<EOF
-+#line 26236 "configure"
++#line 26238 "configure"
 +#include "confdefs.h"
 +
 +#include "main/php.h"
@@ -5241,7 +5453,7 @@
 +#endif
 +; return 0; }
 +EOF
-+if { (eval echo configure:26248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:26250: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 +  rm -rf conftest*
 +  
 +      php_cv_zend_set_lookup_function_hook=yes
@@ -5250,37 +5462,63 @@
 +  echo "configure: failed program was:" >&5
 +  cat conftest.$ac_ext >&5
 +  rm -rf conftest*
-+  
+   
 +      php_cv_zend_set_lookup_function_hook=no
 +    
 +fi
 +rm -f conftest*
 +    CFLAGS=$orig_cflags
-+  
+   
 +fi
-+
+ 
+-  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
 +echo "$ac_t""$php_cv_zend_set_lookup_function_hook" 1>&6
 +  if test "$php_cv_zend_set_lookup_function_hook" = "yes"; then
 +    cat >> confdefs.h <<\EOF
 +#define APC_HAVE_LOOKUP_HOOKS 1
 +EOF
-+
+ 
 +  else
 +    cat >> confdefs.h <<\EOF
 +#define APC_HAVE_LOOKUP_HOOKS 0
 +EOF
-+
+ 
+-  old_IFS=$IFS
+-  for ac_src in bcmath.c \
+-libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
+-libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
+-libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
+-libbcmath/src/rmzero.c libbcmath/src/str2num.c; do
+-  
+-      IFS=.
+-      set $ac_src
+-      ac_obj=$1
+-      IFS=$old_IFS
+-      
+-      PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo"
 +  fi
-+
+ 
+-      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
 +  for ac_func in sigaction
 +do
 +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-+echo "configure:26282: checking for $ac_func" >&5
++echo "configure:26284: 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 26287 "configure"
++#line 26289 "configure"
 +#include "confdefs.h"
 +/* System header to define __stub macros and hopefully few prototypes,
 +    which can conflict with char $ac_func(); below.  */
@@ -5289,7 +5527,10 @@
 +/* We use char because int might match the return type of a gcc2
 +    builtin and then its argument prototype would still apply.  */
 +char $ac_func();
-+
+ 
+-    cat >>Makefile.objects<<EOF
+-$ac_bdir$ac_obj.lo: $ac_srcdir$ac_src
+-      $ac_comp
 +int main() {
 +
 +/* The GNU C library defines this for functions which it implements
@@ -5302,8 +5543,9 @@
 +#endif
 +
 +; return 0; }
-+EOF
-+if { (eval echo configure:26310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ EOF
+-  done
++if { (eval echo configure:26312: \"$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
@@ -5314,7 +5556,7 @@
 +fi
 +rm -f conftest*
 +fi
-+
+ 
 +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
 +  echo "$ac_t""yes" 1>&6
 +    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
@@ -5326,15 +5568,19 @@
 +  echo "$ac_t""no" 1>&6
 +fi
 +done
-+
+ 
+-        ;;
+-    esac
+-    EXT_CLI_STATIC="$EXT_CLI_STATIC bcmath"
+-  fi
 +  echo $ac_n "checking for union semun""... $ac_c" 1>&6
-+echo "configure:26335: checking for union semun" >&5
++echo "configure:26337: 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 26341 "configure"
++#line 26343 "configure"
 +#include "confdefs.h"
 +
 +#include <sys/types.h>
@@ -5345,9 +5591,10 @@
 +union semun x; x.val=1
 +; return 0; }
 +EOF
-+if { (eval echo configure:26352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:26354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 +  rm -rf conftest*
-+  
+   
+-    BUILD_DIR="$BUILD_DIR $ext_builddir"
 +      php_cv_semun=yes
 +    
 +else
@@ -5359,48 +5606,54 @@
 +    
 +fi
 +rm -f conftest*
-+  
+   
 +fi
-+
+ 
 +echo "$ac_t""$php_cv_semun" 1>&6
 +  if test "$php_cv_semun" = "yes"; then
 +    cat >> confdefs.h <<\EOF
 +#define HAVE_SEMUN 1
 +EOF
-+
+ 
+-  if test "$ext_builddir" = "."; then
+-    PHP_PECL_EXTENSION=bcmath
+-    
+-  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 +  else
 +    cat >> confdefs.h <<\EOF
 +#define HAVE_SEMUN 0
 +EOF
-+
-+  fi
-+
+ 
+   fi
+ 
 +  echo $ac_n "checking whether we should enable valgrind support""... $ac_c" 1>&6
-+echo "configure:26383: checking whether we should enable valgrind support" >&5
++echo "configure:26385: 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"
-+  
+   
 +    PHP_APC_VALGRIND=$enableval
 +    echo "$ac_t""$enableval" 1>&6
-+  
+   
+-    BUILD_DIR="$BUILD_DIR $ext_builddir/libbcmath/src"
 +else
-+  
+   
+-
 +    PHP_APC_VALGRIND=yes
 +    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:26397: checking for valgrind/memcheck.h" >&5
++echo "configure:26399: 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 26402 "configure"
++#line 26404 "configure"
 +#include "confdefs.h"
 +#include <valgrind/memcheck.h>
 +EOF
 +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:26407: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:26409: \"$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*
@@ -5416,18 +5669,33 @@
 +fi
 +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
 +  echo "$ac_t""yes" 1>&6
-+  cat >> confdefs.h <<\EOF
+   cat >> confdefs.h <<\EOF
+-#define HAVE_BCMATH 1
 +#define HAVE_VALGRIND_MEMCHECK_H 1
-+EOF
-+
+ EOF
+ 
 +else
 +  echo "$ac_t""no" 1>&6
-+fi
-+
-+  
-+fi
-+
-+
+ fi
+ 
+-
+-
+-php_with_bz2=no
+-
+-echo $ac_n "checking for BZip2 support""... $ac_c" 1>&6
+-echo "configure:26277: checking for BZip2 support" >&5
+-# Check whether --with-bz2 or --without-bz2 was given.
+-if test "${with_bz2+set}" = set; then
+-  withval="$with_bz2"
+-  PHP_BZ2=$withval
+-else
+   
+-  PHP_BZ2=no
+-  test "$PHP_ENABLE_ALL" && PHP_BZ2=$PHP_ENABLE_ALL
+-
+ fi
+ 
+ 
 +  apc_sources="apc.c php_apc.c \
 +               apc_cache.c \
 +               apc_compile.c \
@@ -5449,7 +5717,8 @@
 +               apc_iterator.c \
 +               apc_bin.c \
 +               apc_string.c "
-+
+ 
+-ext_output="yes, shared"
 +  
 +  save_old_LDFLAGS=$LDFLAGS
 +  ac_stuff=""
@@ -5546,7 +5815,7 @@
 +  done
 +
 +  echo $ac_n "checking for shm_open in -lrt""... $ac_c" 1>&6
-+echo "configure:26553: checking for shm_open in -lrt" >&5
++echo "configure:26555: 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
@@ -5554,7 +5823,7 @@
 +  ac_save_LIBS="$LIBS"
 +LIBS="-lrt  $LIBS"
 +cat > conftest.$ac_ext <<EOF
-+#line 26561 "configure"
++#line 26563 "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
@@ -5565,7 +5834,7 @@
 +shm_open()
 +; return 0; }
 +EOF
-+if { (eval echo configure:26572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:26574: \"$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
@@ -5924,185 +6193,554 @@
 +
 +
 +
- php_enable_bcmath=no
- 
- 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: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 +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: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 +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: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 +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: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 +27461,7 @@ else
-   ac_save_LIBS="$LIBS"
- LIBS="-lbz2  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 26443 "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 +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: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 +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: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
++php_enable_bcmath=no
++
++echo $ac_n "checking whether to enable bc style precision math functions""... $ac_c" 1>&6
++echo "configure:26936: 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"
++  PHP_BCMATH=$enableval
++else
++  
++  PHP_BCMATH=no
++  test "$PHP_ENABLE_ALL" && PHP_BCMATH=$PHP_ENABLE_ALL
++
++fi
++
++
++
++ext_output="yes, shared"
++ext_shared=yes
++case $PHP_BCMATH in
++shared,*)
++  PHP_BCMATH=`echo "$PHP_BCMATH"|$SED 's/^shared,//'`
++  ;;
++shared)
++  PHP_BCMATH=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_BCMATH" != "no"; then
++  
++  ext_builddir=ext/bcmath
++  ext_srcdir=$abs_srcdir/ext/bcmath
++
++  ac_extra=`echo "-I@ext_srcdir@/libbcmath/src"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g`
++
++  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
++    PHP_BCMATH_SHARED=no
++    
++  
++  case ext/bcmath in
++  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
++  /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
++  *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; 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 bcmath.c \
++libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
++libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
++libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
++libbcmath/src/rmzero.c libbcmath/src/str2num.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 bcmath"
++    if test "$ext_shared" != "nocli"; then
++      EXT_CLI_STATIC="$EXT_CLI_STATIC bcmath"
++    fi
++  else
++    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
++      PHP_BCMATH_SHARED=yes
++      
++  case ext/bcmath in
++  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
++  /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
++  *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; 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 bcmath.c \
++libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
++libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
++libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
++libbcmath/src/rmzero.c libbcmath/src/str2num.c; do
++  
++      IFS=.
++      set $ac_src
++      ac_obj=$1
++      IFS=$old_IFS
++      
++      shared_objects_bcmath="$shared_objects_bcmath $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'/phpbcmath.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) $(PHPBCMATH_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpbcmath.so '$ext_builddir'/phpbcmath.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_bcmath) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPBCMATH, 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_bcmath) $(PHPBCMATH_SHARED_LIBADD)'
++      ;;
++  esac
++
++  if test "x" = "xyes"; then
++    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpbcmath.$suffix"
++  else
++    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpbcmath.$suffix"
++  fi
++  
++  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath"
++
++  cat >>Makefile.objects<<EOF
++\$(phplibdir)/phpbcmath.$suffix: $ext_builddir/phpbcmath.$suffix
++      \$(LIBTOOL) --mode=install cp $ext_builddir/phpbcmath.$suffix \$(phplibdir)
++
++$ext_builddir/phpbcmath.$suffix: \$(shared_objects_bcmath) \$(PHPBCMATH_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'/bcmath.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) $(BCMATH_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/bcmath.so '$ext_builddir'/bcmath.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_bcmath) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(BCMATH, 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_bcmath) $(BCMATH_SHARED_LIBADD)'
++      ;;
++  esac
++
++  if test "x" = "xyes"; then
++    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/bcmath.$suffix"
++  else
++    PHP_MODULES="$PHP_MODULES \$(phplibdir)/bcmath.$suffix"
++  fi
++  
++  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath"
++
++  cat >>Makefile.objects<<EOF
++\$(phplibdir)/bcmath.$suffix: $ext_builddir/bcmath.$suffix
++      \$(LIBTOOL) --mode=install cp $ext_builddir/bcmath.$suffix \$(phplibdir)
++
++$ext_builddir/bcmath.$suffix: \$(shared_objects_bcmath) \$(BCMATH_SHARED_DEPENDENCIES)
++      $link_cmd
++
++EOF
++
++          ;;
++      esac
++      cat >> confdefs.h <<EOF
++#define COMPILE_DL_BCMATH 1
++EOF
++
++    fi
++  fi
++
++  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
++    PHP_BCMATH_SHARED=no
++    case "$PHP_SAPI" in
++      cgi|embed)
++        
++  
++  case ext/bcmath in
++  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
++  /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
++  *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; 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 bcmath.c \
++libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
++libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
++libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
++libbcmath/src/rmzero.c libbcmath/src/str2num.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 bcmath"
++        ;;
++      *)
++        
++  
++  case ext/bcmath in
++  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
++  /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
++  *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; 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 bcmath.c \
++libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
++libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
++libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
++libbcmath/src/rmzero.c libbcmath/src/str2num.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 bcmath"
++  fi
++  
++  
++    BUILD_DIR="$BUILD_DIR $ext_builddir"
++  
++
++
++  if test "$ext_builddir" = "."; then
++    PHP_PECL_EXTENSION=bcmath
++    
++  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
++
++  fi
++
++  
++  
++    BUILD_DIR="$BUILD_DIR $ext_builddir/libbcmath/src"
++  
++
++  cat >> confdefs.h <<\EOF
++#define HAVE_BCMATH 1
++EOF
++
++fi
++
++
++
++php_with_bz2=no
++
++echo $ac_n "checking for BZip2 support""... $ac_c" 1>&6
++echo "configure:27301: checking for BZip2 support" >&5
++# Check whether --with-bz2 or --without-bz2 was given.
++if test "${with_bz2+set}" = set; then
++  withval="$with_bz2"
++  PHP_BZ2=$withval
++else
++  
++  PHP_BZ2=no
++  test "$PHP_ENABLE_ALL" && PHP_BZ2=$PHP_ENABLE_ALL
++
++fi
++
++
++
++ext_output="yes, shared"
+ ext_shared=yes
+ case $PHP_BZ2 in
+ shared,*)
+@@ -26318,7 +27342,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:27346: 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 +27455,7 @@ echo "configure:26322: checking for BZip
+   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:27459: 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 +27463,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lbz2  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 26443 "configure"
++#line 27467 "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 +27474,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:27478: \"$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 +27942,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:27946: 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 +28284,7 @@ fi
+@@ -27262,7 +28286,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:28288: checking whether to enable ctype functions" >&5
++echo "configure:28290: 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 +28628,7 @@ fi
+@@ -27606,7 +28630,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:28632: checking for cURL support" >&5
++echo "configure:28634: 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 +28672,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -27650,7 +28674,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:28676: checking if we should use cURL for url streams" >&5
++echo "configure:28678: 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 +28696,7 @@ if test "$PHP_CURL" != "no"; then
+@@ -27674,7 +28698,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:28700: checking for cURL in default path" >&5
++echo "configure:28702: 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 +28714,7 @@ echo "configure:27678: checking for cURL in default path" >&5
+@@ -27692,7 +28716,7 @@ echo "configure:27678: checking for cURL
  
    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:28718: checking for cURL 7.10.5 or greater" >&5
++echo "configure:28720: 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 +28952,7 @@ echo "configure:27696: checking for cURL 7.10.5 or greater" >&5
+@@ -27930,7 +28954,7 @@ echo "configure:27696: checking for cURL
  
    
    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:28956: checking for SSL support in libcurl" >&5
++echo "configure:28958: 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 +28965,7 @@ EOF
+@@ -27943,7 +28967,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:28969: checking how to run the C preprocessor" >&5
++echo "configure:28971: 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 +28980,13 @@ else
+@@ -27958,13 +28982,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 28984 "configure"
++#line 28986 "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:28990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:28992: \"$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 +28997,13 @@ else
+@@ -27975,13 +28999,13 @@ else
    rm -rf conftest*
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
 -#line 27979 "configure"
-+#line 29001 "configure"
++#line 29003 "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:29007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:29009: \"$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 +29014,13 @@ else
+@@ -27992,13 +29016,13 @@ else
    rm -rf conftest*
    CPP="${CC-cc} -nologo -E"
    cat > conftest.$ac_ext <<EOF
 -#line 27996 "configure"
-+#line 29018 "configure"
++#line 29020 "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:29024: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:29026: \"$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 +29045,14 @@ fi
+@@ -28023,14 +29047,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:29049: checking for openssl support in libcurl" >&5
++echo "configure:29051: checking for openssl support in libcurl" >&5
      if test "$cross_compiling" = yes; then
    
        echo "$ac_t""no" 1>&6
@@ -6110,46 +6748,46 @@
  else
    cat > conftest.$ac_ext <<EOF
 -#line 28034 "configure"
-+#line 29056 "configure"
++#line 29058 "configure"
  #include "confdefs.h"
  
  #include <curl/curl.h>
-@@ -28049,7 +29071,7 @@ int main(int argc, char *argv[])
+@@ -28049,7 +29073,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:29075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:29077: \"$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 +29079,17 @@ then
+@@ -28057,17 +29081,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:29083: checking for $ac_hdr" >&5
++echo "configure:29085: 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 29088 "configure"
++#line 29090 "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:29093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:29095: \"$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 +29134,14 @@ fi
+@@ -28112,14 +29136,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:29138: checking for gnutls support in libcurl" >&5
++echo "configure:29140: checking for gnutls support in libcurl" >&5
      if test "$cross_compiling" = yes; then
    
        echo "$ac_t""no" 1>&6
@@ -6157,691 +6795,681 @@
  else
    cat > conftest.$ac_ext <<EOF
 -#line 28123 "configure"
-+#line 29145 "configure"
++#line 29147 "configure"
  #include "confdefs.h"
  
  #include <curl/curl.h>
-@@ -28138,23 +29160,23 @@ int main(int argc, char *argv[])
+@@ -28138,23 +29162,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:29164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:29166: \"$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:29170: checking for gcrypt.h" >&5
++echo "configure:29172: 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 29175 "configure"
++#line 29177 "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:29180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:29182: \"$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 +29318,7 @@ fi
+@@ -28296,7 +29320,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:29322: checking for curl_easy_perform in -lcurl" >&5
++echo "configure:29324: 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 +29326,7 @@ else
+@@ -28304,7 +29328,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lcurl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 28308 "configure"
-+#line 29330 "configure"
++#line 29332 "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 +29337,7 @@ int main() {
+@@ -28315,7 +29339,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:29341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:29343: \"$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 +29473,7 @@ fi
+@@ -28451,7 +29475,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:29477: checking for curl_version_info in -lcurl" >&5
++echo "configure:29479: 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 +29481,7 @@ else
+@@ -28459,7 +29483,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lcurl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 28463 "configure"
-+#line 29485 "configure"
++#line 29487 "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 +29492,7 @@ int main() {
+@@ -28470,7 +29494,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:29496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:29498: \"$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 +29626,7 @@ fi
+@@ -28604,7 +29628,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:29630: checking for curl_easy_strerror in -lcurl" >&5
++echo "configure:29632: 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 +29634,7 @@ else
+@@ -28612,7 +29636,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lcurl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 28616 "configure"
-+#line 29638 "configure"
++#line 29640 "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 +29645,7 @@ int main() {
+@@ -28623,7 +29647,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:29649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:29651: \"$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 +29779,7 @@ fi
+@@ -28757,7 +29781,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:29783: checking for curl_multi_strerror in -lcurl" >&5
++echo "configure:29785: 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 +29787,7 @@ else
+@@ -28765,7 +29789,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lcurl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 28769 "configure"
-+#line 29791 "configure"
++#line 29793 "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 +29798,7 @@ int main() {
+@@ -28776,7 +29800,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:29802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:29804: \"$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 +30484,7 @@ if test "$PHP_QDBM" != "no"; then
+@@ -29462,7 +30486,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:30488: checking for dpopen in -l$LIB" >&5
++echo "configure:30490: 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 +30492,7 @@ else
+@@ -29470,7 +30494,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$LIB  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 29474 "configure"
-+#line 30496 "configure"
++#line 30498 "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 +30503,7 @@ int main() {
+@@ -29481,7 +30505,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:30507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:30509: \"$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 +30672,7 @@ fi
+@@ -29650,7 +30674,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:30676: checking for $THIS_FULL_NAME support" >&5
++echo "configure:30678: checking for $THIS_FULL_NAME support" >&5
    if test -n ""; then
      { echo "configure: error: " 1>&2; exit 1; }
    fi
-@@ -29678,7 +30700,7 @@ if test "$PHP_GDBM" != "no"; then
+@@ -29678,7 +30702,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:30704: checking for $THIS_FULL_NAME support" >&5
++echo "configure:30706: 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 +30819,7 @@ echo "configure:29682: checking for $THIS_FULL_NAME support" >&5
+@@ -29797,7 +30821,7 @@ echo "configure:29682: checking for $THI
    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:30823: checking for gdbm_open in -lgdbm" >&5
++echo "configure:30825: 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 +30827,7 @@ else
+@@ -29805,7 +30829,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgdbm  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 29809 "configure"
-+#line 30831 "configure"
++#line 30833 "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 +30838,7 @@ int main() {
+@@ -29816,7 +30840,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:30842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:30844: \"$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 +31003,7 @@ fi
+@@ -29981,7 +31005,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:31007: checking for $THIS_FULL_NAME support" >&5
++echo "configure:31009: checking for $THIS_FULL_NAME support" >&5
    if test -n ""; then
      { echo "configure: error: " 1>&2; exit 1; }
    fi
-@@ -30110,7 +31132,7 @@ if test "$PHP_NDBM" != "no"; then
+@@ -30110,7 +31134,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:31136: checking for dbm_open in -l$LIB" >&5
++echo "configure:31138: 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 +31140,7 @@ else
+@@ -30118,7 +31142,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$LIB  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 30122 "configure"
-+#line 31144 "configure"
++#line 31146 "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 +31151,7 @@ int main() {
+@@ -30129,7 +31153,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:31155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:31157: \"$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 +31320,7 @@ fi
+@@ -30298,7 +31322,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:31324: checking for $THIS_FULL_NAME support" >&5
++echo "configure:31326: checking for $THIS_FULL_NAME support" >&5
    if test -n ""; then
      { echo "configure: error: " 1>&2; exit 1; }
    fi
-@@ -30382,7 +31404,7 @@ if test "$PHP_DB4" != "no"; then
+@@ -30382,7 +31406,7 @@ if test "$PHP_DB4" != "no"; then
    LIBS="-l$LIB $LIBS"
    
          cat > conftest.$ac_ext <<EOF
 -#line 30386 "configure"
-+#line 31408 "configure"
++#line 31410 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -30393,11 +31415,11 @@ int main() {
+@@ -30393,11 +31417,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:31419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:31421: \"$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 31423 "configure"
++#line 31425 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -30434,14 +31456,14 @@ rm -f conftest*
+@@ -30434,14 +31458,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:31460: checking for DB4 major version" >&5
++echo "configure:31462: 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:31465: checking for DB4 minor version and patch level" >&5
++echo "configure:31467: checking for DB4 minor version and patch level" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 30445 "configure"
-+#line 31467 "configure"
++#line 31469 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -30467,9 +31489,9 @@ rm -f conftest*
+@@ -30467,9 +31491,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:31493: checking if dba can be used as shared extension" >&5
++echo "configure:31495: checking if dba can be used as shared extension" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 30473 "configure"
-+#line 31495 "configure"
++#line 31497 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -30626,7 +31648,7 @@ fi
+@@ -30626,7 +31650,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:31652: checking for $THIS_FULL_NAME support" >&5
++echo "configure:31654: checking for $THIS_FULL_NAME support" >&5
    if test -n ""; then
      { echo "configure: error: " 1>&2; exit 1; }
    fi
-@@ -30654,7 +31676,7 @@ if test "$PHP_DB3" != "no"; then
+@@ -30654,7 +31678,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:31680: checking for $THIS_FULL_NAME support" >&5
++echo "configure:31682: 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 +31727,7 @@ echo "configure:30658: checking for $THIS_FULL_NAME support" >&5
+@@ -30705,7 +31729,7 @@ echo "configure:30658: checking for $THI
    LIBS="-l$LIB $LIBS"
    
          cat > conftest.$ac_ext <<EOF
 -#line 30709 "configure"
-+#line 31731 "configure"
++#line 31733 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -30716,11 +31738,11 @@ int main() {
+@@ -30716,11 +31740,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:31742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:31744: \"$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 31746 "configure"
++#line 31748 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -30757,14 +31779,14 @@ rm -f conftest*
+@@ -30757,14 +31781,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:31783: checking for DB3 major version" >&5
++echo "configure:31785: 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:31788: checking for DB4 minor version and patch level" >&5
++echo "configure:31790: checking for DB4 minor version and patch level" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 30768 "configure"
-+#line 31790 "configure"
++#line 31792 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -30790,9 +31812,9 @@ rm -f conftest*
+@@ -30790,9 +31814,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:31816: checking if dba can be used as shared extension" >&5
++echo "configure:31818: checking if dba can be used as shared extension" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 30796 "configure"
-+#line 31818 "configure"
++#line 31820 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -30949,7 +31971,7 @@ fi
+@@ -30949,7 +31973,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:31975: checking for $THIS_FULL_NAME support" >&5
++echo "configure:31977: checking for $THIS_FULL_NAME support" >&5
    if test -n ""; then
      { echo "configure: error: " 1>&2; exit 1; }
    fi
-@@ -30977,7 +31999,7 @@ if test "$PHP_DB2" != "no"; then
+@@ -30977,7 +32001,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:32003: checking for $THIS_FULL_NAME support" >&5
++echo "configure:32005: 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 +32050,7 @@ echo "configure:30981: checking for $THIS_FULL_NAME support" >&5
+@@ -31028,7 +32052,7 @@ echo "configure:30981: checking for $THI
    LIBS="-l$LIB $LIBS"
    
          cat > conftest.$ac_ext <<EOF
 -#line 31032 "configure"
-+#line 32054 "configure"
++#line 32056 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -31039,11 +32061,11 @@ int main() {
+@@ -31039,11 +32063,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:32065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:32067: \"$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 32069 "configure"
++#line 32071 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -31080,14 +32102,14 @@ rm -f conftest*
+@@ -31080,14 +32104,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:32106: checking for DB2 major version" >&5
++echo "configure:32108: 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:32111: checking for DB4 minor version and patch level" >&5
++echo "configure:32113: checking for DB4 minor version and patch level" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 31091 "configure"
-+#line 32113 "configure"
++#line 32115 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -31113,9 +32135,9 @@ rm -f conftest*
+@@ -31113,9 +32137,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:32139: checking if dba can be used as shared extension" >&5
++echo "configure:32141: checking if dba can be used as shared extension" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 31119 "configure"
-+#line 32141 "configure"
++#line 32143 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -31272,7 +32294,7 @@ fi
+@@ -31272,7 +32296,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:32298: checking for $THIS_FULL_NAME support" >&5
++echo "configure:32300: checking for $THIS_FULL_NAME support" >&5
    if test -n ""; then
      { echo "configure: error: " 1>&2; exit 1; }
    fi
-@@ -31292,7 +32314,7 @@ if test "$PHP_DB1" != "no"; then
+@@ -31292,7 +32316,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:32318: checking for DB1 in library" >&5
++echo "configure:32320: checking for DB1 in library" >&5
    if test "$HAVE_DB4" = "1"; then
      THIS_VERSION=4
      THIS_LIBS=$DB4_LIBS
-@@ -31340,7 +32362,7 @@ EOF
+@@ -31340,7 +32364,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:32366: checking for DB1 in header" >&5
++echo "configure:32368: checking for DB1 in header" >&5
    echo "$ac_t""$THIS_INCLUDE" 1>&6
    if test -n "$THIS_INCLUDE"; then
      
-@@ -31350,7 +32372,7 @@ echo "configure:31344: checking for DB1 in header" >&5
+@@ -31350,7 +32374,7 @@ echo "configure:31344: checking for DB1
    LIBS="-l$THIS_LIBS $LIBS"
    
        cat > conftest.$ac_ext <<EOF
 -#line 31354 "configure"
-+#line 32376 "configure"
++#line 32378 "configure"
  #include "confdefs.h"
  
  #include "$THIS_INCLUDE"
-@@ -31361,7 +32383,7 @@ int main() {
+@@ -31361,7 +32385,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:32387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:32389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    
          cat >> confdefs.h <<EOF
-@@ -31511,7 +32533,7 @@ fi
+@@ -31511,7 +32535,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:32537: checking for $THIS_FULL_NAME support" >&5
++echo "configure:32539: checking for $THIS_FULL_NAME support" >&5
    if test -n ""; then
      { echo "configure: error: " 1>&2; exit 1; }
    fi
-@@ -31539,7 +32561,7 @@ if test "$PHP_DBM" != "no"; then
+@@ -31539,7 +32563,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:32565: checking for $THIS_FULL_NAME support" >&5
++echo "configure:32567: 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 +32685,7 @@ echo "configure:31543: checking for $THIS_FULL_NAME support" >&5
+@@ -31663,7 +32687,7 @@ echo "configure:31543: checking for $THI
    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:32689: checking for dbminit in -l$LIB" >&5
++echo "configure:32691: 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 +32693,7 @@ else
+@@ -31671,7 +32695,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$LIB  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 31675 "configure"
-+#line 32697 "configure"
++#line 32699 "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 +32704,7 @@ int main() {
+@@ -31682,7 +32706,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:32708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:32710: \"$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 +32724,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+@@ -31702,7 +32726,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
      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:32728: checking for DBM using GDBM" >&5
++echo "configure:32730: checking for DBM using GDBM" >&5
          cat >> confdefs.h <<EOF
  #define DBM_INCLUDE_FILE "$THIS_INCLUDE"
  EOF
-@@ -31866,7 +32888,7 @@ fi
+@@ -31866,7 +32890,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:32892: checking for $THIS_FULL_NAME support" >&5
++echo "configure:32894: checking for $THIS_FULL_NAME support" >&5
    if test -n ""; then
      { echo "configure: error: " 1>&2; exit 1; }
    fi
-@@ -32078,7 +33100,7 @@ elif test "$PHP_CDB" != "no"; then
+@@ -32078,7 +33102,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:33104: checking for cdb_read in -l$LIB" >&5
++echo "configure:33106: 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 +33108,7 @@ else
+@@ -32086,7 +33110,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$LIB  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 32090 "configure"
-+#line 33112 "configure"
++#line 33114 "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 +33119,7 @@ int main() {
+@@ -32097,7 +33121,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:33123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:33125: \"$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 +33288,7 @@ fi
+@@ -32266,7 +33290,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:33292: checking for $THIS_FULL_NAME support" >&5
-   if test -n ""; then
-     { echo "configure: error: " 1>&2; exit 1; }
-   fi
-@@ -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:33323: checking for $THIS_FULL_NAME support" >&5
++echo "configure:33294: checking for $THIS_FULL_NAME support" >&5
    if test -n ""; then
      { echo "configure: error: " 1>&2; exit 1; }
    fi
-@@ -32328,7 +33350,7 @@ fi
+@@ -32297,7 +33321,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:33354: checking for $THIS_FULL_NAME support" >&5
-   if test -n ""; then
-     { echo "configure: error: " 1>&2; exit 1; }
-   fi
-@@ -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: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
-@@ -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
-+
+-echo "configure:32301: checking for $THIS_FULL_NAME support" >&5
++echo "configure:33325: checking for $THIS_FULL_NAME support" >&5
+   if test -n ""; then
+     { echo "configure: error: " 1>&2; exit 1; }
+   fi
+@@ -32321,53 +33345,413 @@ EOF
+   THIS_RESULT="builtin"
+ fi
+ 
+-  THIS_NAME=FLATFILE
+-  if test -n "FlatFile"; then
+-    THIS_FULL_NAME="FlatFile"
+-  else
+-    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
+-  if test -n ""; then
+-    { echo "configure: error: " 1>&2; exit 1; }
+-  fi
+-  if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
+-    HAVE_DBA=1
+-    eval HAVE_$THIS_NAME=1
+-    echo "$ac_t""$THIS_RESULT" 1>&6
+-  else
+-    echo "$ac_t""no" 1>&6
+-  fi
+-  unset THIS_RESULT THIS_NAME THIS_FULL_NAME
++  THIS_NAME=FLATFILE
++  if test -n "FlatFile"; then
++    THIS_FULL_NAME="FlatFile"
++  else
++    THIS_FULL_NAME="$THIS_NAME"
++  fi
++  echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6
++echo "configure:33356: checking for $THIS_FULL_NAME support" >&5
++  if test -n ""; then
++    { echo "configure: error: " 1>&2; exit 1; }
++  fi
++  if test "$THIS_RESULT" = "yes" || test "$THIS_RESULT" = "builtin"; then
++    HAVE_DBA=1
++    eval HAVE_$THIS_NAME=1
++    echo "$ac_t""$THIS_RESULT" 1>&6
++  else
++    echo "$ac_t""no" 1>&6
++  fi
++  unset THIS_RESULT THIS_NAME THIS_FULL_NAME
 +
 +
++echo $ac_n "checking whether to enable DBA interface""... $ac_c" 1>&6
++echo "configure:33371: 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
++  else
++    echo "$ac_t""yes" 1>&6
++  fi
++  cat >> confdefs.h <<\EOF
++#define HAVE_DBA 1
++EOF
 +
-+if test "$PHP_DIO" != "no"; then
 +  
-+  ext_builddir=ext/dio
-+  ext_srcdir=$abs_srcdir/ext/dio
++  ext_builddir=ext/dba
++  ext_srcdir=$abs_srcdir/ext/dba
 +
 +  ac_extra=
 +
 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
-+    PHP_DIO_SHARED=no
++    PHP_DBA_SHARED=no
 +    
 +  
-+  case ext/dio in
++  case ext/dba 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" ;;
++  /*) ac_srcdir=`echo "ext/dba"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
++  *) ac_srcdir="$abs_srcdir/ext/dba/"; ac_bdir="ext/dba/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
 +  esac
 +  
 +  
@@ -6856,7 +7484,7 @@
 +
 +
 +  old_IFS=$IFS
-+  for ac_src in dio.c dio_common.c dio_posix.c dio_stream_wrappers.c; do
++  for ac_src in dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c $cdb_sources $flat_sources $ini_sources; do
 +  
 +      IFS=.
 +      set $ac_src
@@ -6879,18 +7507,18 @@
 +  done
 +
 +
-+    EXT_STATIC="$EXT_STATIC dio"
++    EXT_STATIC="$EXT_STATIC dba"
 +    if test "$ext_shared" != "nocli"; then
-+      EXT_CLI_STATIC="$EXT_CLI_STATIC dio"
++      EXT_CLI_STATIC="$EXT_CLI_STATIC dba"
 +    fi
 +  else
 +    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
-+      PHP_DIO_SHARED=yes
++      PHP_DBA_SHARED=yes
 +      
-+  case ext/dio in
++  case ext/dba 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" ;;
++  /*) ac_srcdir=`echo "ext/dba"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
++  *) ac_srcdir="$abs_srcdir/ext/dba/"; ac_bdir="ext/dba/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
 +  esac
 +  
 +  
@@ -6905,14 +7533,14 @@
 +
 +
 +  old_IFS=$IFS
-+  for ac_src in dio.c dio_common.c dio_posix.c dio_stream_wrappers.c; do
++  for ac_src in dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c $cdb_sources $flat_sources $ini_sources; do
 +  
 +      IFS=.
 +      set $ac_src
 +      ac_obj=$1
 +      IFS=$old_IFS
 +      
-+      shared_objects_dio="$shared_objects_dio $ac_bdir$ac_obj.lo"
++      shared_objects_dba="$shared_objects_dba $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" ;;
@@ -6935,31 +7563,31 @@
 +  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'
++      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpdba.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dba) $(PHPDBA_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpdba.so '$ext_builddir'/phpdba.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)'
++      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_dba) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPDBA, 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)'
++      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_dba) $(PHPDBA_SHARED_LIBADD)'
 +      ;;
 +  esac
 +
 +  if test "x" = "xyes"; then
-+    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpdio.$suffix"
++    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpdba.$suffix"
 +  else
-+    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpdio.$suffix"
++    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpdba.$suffix"
 +  fi
 +  
-+  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dio"
++  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dba"
 +
 +  cat >>Makefile.objects<<EOF
-+\$(phplibdir)/phpdio.$suffix: $ext_builddir/phpdio.$suffix
-+      \$(LIBTOOL) --mode=install cp $ext_builddir/phpdio.$suffix \$(phplibdir)
++\$(phplibdir)/phpdba.$suffix: $ext_builddir/phpdba.$suffix
++      \$(LIBTOOL) --mode=install cp $ext_builddir/phpdba.$suffix \$(phplibdir)
 +
-+$ext_builddir/phpdio.$suffix: \$(shared_objects_dio) \$(PHPDIO_SHARED_DEPENDENCIES)
++$ext_builddir/phpdba.$suffix: \$(shared_objects_dba) \$(PHPDBA_SHARED_DEPENDENCIES)
 +      $link_cmd
 +
 +EOF
@@ -6972,31 +7600,31 @@
 +  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'
++      link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/dba.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dba) $(DBA_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/dba.so '$ext_builddir'/dba.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)'
++      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_dba) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(DBA, 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)'
++      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_dba) $(DBA_SHARED_LIBADD)'
 +      ;;
 +  esac
 +
 +  if test "x" = "xyes"; then
-+    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/dio.$suffix"
++    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/dba.$suffix"
 +  else
-+    PHP_MODULES="$PHP_MODULES \$(phplibdir)/dio.$suffix"
++    PHP_MODULES="$PHP_MODULES \$(phplibdir)/dba.$suffix"
 +  fi
 +  
-+  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dio"
++  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dba"
 +
 +  cat >>Makefile.objects<<EOF
-+\$(phplibdir)/dio.$suffix: $ext_builddir/dio.$suffix
-+      \$(LIBTOOL) --mode=install cp $ext_builddir/dio.$suffix \$(phplibdir)
++\$(phplibdir)/dba.$suffix: $ext_builddir/dba.$suffix
++      \$(LIBTOOL) --mode=install cp $ext_builddir/dba.$suffix \$(phplibdir)
 +
-+$ext_builddir/dio.$suffix: \$(shared_objects_dio) \$(DIO_SHARED_DEPENDENCIES)
++$ext_builddir/dba.$suffix: \$(shared_objects_dba) \$(DBA_SHARED_DEPENDENCIES)
 +      $link_cmd
 +
 +EOF
@@ -7004,22 +7632,22 @@
 +          ;;
 +      esac
 +      cat >> confdefs.h <<EOF
-+#define COMPILE_DL_DIO 1
++#define COMPILE_DL_DBA 1
 +EOF
 +
 +    fi
 +  fi
 +
 +  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
-+    PHP_DIO_SHARED=no
++    PHP_DBA_SHARED=no
 +    case "$PHP_SAPI" in
 +      cgi|embed)
 +        
 +  
-+  case ext/dio in
++  case ext/dba 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" ;;
++  /*) ac_srcdir=`echo "ext/dba"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
++  *) ac_srcdir="$abs_srcdir/ext/dba/"; ac_bdir="ext/dba/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
 +  esac
 +  
 +  
@@ -7034,7 +7662,7 @@
 +
 +
 +  old_IFS=$IFS
-+  for ac_src in dio.c dio_common.c dio_posix.c dio_stream_wrappers.c; do
++  for ac_src in dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c $cdb_sources $flat_sources $ini_sources; do
 +  
 +      IFS=.
 +      set $ac_src
@@ -7057,15 +7685,15 @@
 +  done
 +
 +
-+        EXT_STATIC="$EXT_STATIC dio"
++        EXT_STATIC="$EXT_STATIC dba"
 +        ;;
 +      *)
 +        
 +  
-+  case ext/dio in
++  case ext/dba 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" ;;
++  /*) ac_srcdir=`echo "ext/dba"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
++  *) ac_srcdir="$abs_srcdir/ext/dba/"; ac_bdir="ext/dba/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
 +  esac
 +  
 +  
@@ -7080,7 +7708,7 @@
 +
 +
 +  old_IFS=$IFS
-+  for ac_src in dio.c dio_common.c dio_posix.c dio_stream_wrappers.c; do
++  for ac_src in dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c $cdb_sources $flat_sources $ini_sources; do
 +  
 +      IFS=.
 +      set $ac_src
@@ -7105,7 +7733,7 @@
 +
 +        ;;
 +    esac
-+    EXT_CLI_STATIC="$EXT_CLI_STATIC dio"
++    EXT_CLI_STATIC="$EXT_CLI_STATIC dba"
 +  fi
 +  
 +  
@@ -7114,2925 +7742,4298 @@
 +
 +
 +  if test "$ext_builddir" = "."; then
-+    PHP_PECL_EXTENSION=dio
++    PHP_PECL_EXTENSION=dba
 +    
 +  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
 +
 +  fi
 +
++  
++  
++    BUILD_DIR="$BUILD_DIR $ext_builddir/libinifile"
++  
++
++  
++  
++    BUILD_DIR="$BUILD_DIR $ext_builddir/libcdb"
++  
++
++  
++  
++    BUILD_DIR="$BUILD_DIR $ext_builddir/libflatfile"
++  
++
++  
++  PHP_VAR_SUBST="$PHP_VAR_SUBST DBA_SHARED_LIBADD"
++
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++
++
++php_enable_dio=no
++
++echo $ac_n "checking whether to enable direct I/O support""... $ac_c" 1>&6
++echo "configure:33701: 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
++
+ 
+ 
+-echo $ac_n "checking whether to enable DBA interface""... $ac_c" 1>&6
+-echo "configure:32347: 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
+-  else
+-    echo "$ac_t""yes" 1>&6
+-  fi
+-  cat >> confdefs.h <<\EOF
+-#define HAVE_DBA 1
+-EOF
+ 
++if test "$PHP_DIO" != "no"; then
+   
+-  ext_builddir=ext/dba
+-  ext_srcdir=$abs_srcdir/ext/dba
++  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_DBA_SHARED=no
++    PHP_DIO_SHARED=no
+     
+   
+-  case ext/dba in
++  case ext/dio in
+   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+-  /*) ac_srcdir=`echo "ext/dba"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+-  *) ac_srcdir="$abs_srcdir/ext/dba/"; ac_bdir="ext/dba/"; ac_inc="-I$ac_bdir -I$ac_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
+   
+   
+@@ -32382,7 +33766,7 @@ EOF
+ 
+ 
+   old_IFS=$IFS
+-  for ac_src in dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c $cdb_sources $flat_sources $ini_sources; do
++  for ac_src in dio.c dio_common.c dio_posix.c dio_stream_wrappers.c; do
+   
+       IFS=.
+       set $ac_src
+@@ -32405,18 +33789,18 @@ EOF
+   done
+ 
+ 
+-    EXT_STATIC="$EXT_STATIC dba"
++    EXT_STATIC="$EXT_STATIC dio"
+     if test "$ext_shared" != "nocli"; then
+-      EXT_CLI_STATIC="$EXT_CLI_STATIC dba"
++      EXT_CLI_STATIC="$EXT_CLI_STATIC dio"
+     fi
+   else
+     if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
+-      PHP_DBA_SHARED=yes
++      PHP_DIO_SHARED=yes
+       
+-  case ext/dba in
++  case ext/dio in
+   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+-  /*) ac_srcdir=`echo "ext/dba"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+-  *) ac_srcdir="$abs_srcdir/ext/dba/"; ac_bdir="ext/dba/"; ac_inc="-I$ac_bdir -I$ac_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
+   
+   
+@@ -32431,14 +33815,14 @@ EOF
+ 
+ 
+   old_IFS=$IFS
+-  for ac_src in dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c $cdb_sources $flat_sources $ini_sources; do
++  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_dba="$shared_objects_dba $ac_bdir$ac_obj.lo"
++      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" ;;
+@@ -32461,31 +33845,31 @@ EOF
+   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'/phpdba.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dba) $(PHPDBA_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpdba.so '$ext_builddir'/phpdba.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_dba) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPDBA, 3)_SHARED_LIBADD)'
++      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_dba) $(PHPDBA_SHARED_LIBADD)'
++      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)/phpdba.$suffix"
++    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpdio.$suffix"
+   else
+-    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpdba.$suffix"
++    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpdio.$suffix"
+   fi
+   
+-  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dba"
++  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dio"
+ 
+   cat >>Makefile.objects<<EOF
+-\$(phplibdir)/phpdba.$suffix: $ext_builddir/phpdba.$suffix
+-      \$(LIBTOOL) --mode=install cp $ext_builddir/phpdba.$suffix \$(phplibdir)
++\$(phplibdir)/phpdio.$suffix: $ext_builddir/phpdio.$suffix
++      \$(LIBTOOL) --mode=install cp $ext_builddir/phpdio.$suffix \$(phplibdir)
+ 
+-$ext_builddir/phpdba.$suffix: \$(shared_objects_dba) \$(PHPDBA_SHARED_DEPENDENCIES)
++$ext_builddir/phpdio.$suffix: \$(shared_objects_dio) \$(PHPDIO_SHARED_DEPENDENCIES)
+       $link_cmd
+ 
+ EOF
+@@ -32498,31 +33882,31 @@ EOF
+   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'/dba.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_dba) $(DBA_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/dba.so '$ext_builddir'/dba.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_dba) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(DBA, 3)_SHARED_LIBADD)'
++      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_dba) $(DBA_SHARED_LIBADD)'
++      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)/dba.$suffix"
++    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/dio.$suffix"
+   else
+-    PHP_MODULES="$PHP_MODULES \$(phplibdir)/dba.$suffix"
++    PHP_MODULES="$PHP_MODULES \$(phplibdir)/dio.$suffix"
+   fi
+   
+-  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dba"
++  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_dio"
+ 
+   cat >>Makefile.objects<<EOF
+-\$(phplibdir)/dba.$suffix: $ext_builddir/dba.$suffix
+-      \$(LIBTOOL) --mode=install cp $ext_builddir/dba.$suffix \$(phplibdir)
++\$(phplibdir)/dio.$suffix: $ext_builddir/dio.$suffix
++      \$(LIBTOOL) --mode=install cp $ext_builddir/dio.$suffix \$(phplibdir)
+ 
+-$ext_builddir/dba.$suffix: \$(shared_objects_dba) \$(DBA_SHARED_DEPENDENCIES)
++$ext_builddir/dio.$suffix: \$(shared_objects_dio) \$(DIO_SHARED_DEPENDENCIES)
+       $link_cmd
+ 
+ EOF
+@@ -32530,22 +33914,22 @@ EOF
+           ;;
+       esac
+       cat >> confdefs.h <<EOF
+-#define COMPILE_DL_DBA 1
++#define COMPILE_DL_DIO 1
+ EOF
+ 
+     fi
+   fi
+ 
+   if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
+-    PHP_DBA_SHARED=no
++    PHP_DIO_SHARED=no
+     case "$PHP_SAPI" in
+       cgi|embed)
+         
+   
+-  case ext/dba in
++  case ext/dio in
+   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+-  /*) ac_srcdir=`echo "ext/dba"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+-  *) ac_srcdir="$abs_srcdir/ext/dba/"; ac_bdir="ext/dba/"; ac_inc="-I$ac_bdir -I$ac_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
+   
+   
+@@ -32560,7 +33944,7 @@ EOF
+ 
+ 
+   old_IFS=$IFS
+-  for ac_src in dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c $cdb_sources $flat_sources $ini_sources; do
++  for ac_src in dio.c dio_common.c dio_posix.c dio_stream_wrappers.c; do
+   
+       IFS=.
+       set $ac_src
+@@ -32583,15 +33967,15 @@ EOF
+   done
+ 
+ 
+-        EXT_STATIC="$EXT_STATIC dba"
++        EXT_STATIC="$EXT_STATIC dio"
+         ;;
+       *)
+         
+   
+-  case ext/dba in
++  case ext/dio in
+   "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
+-  /*) ac_srcdir=`echo "ext/dba"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
+-  *) ac_srcdir="$abs_srcdir/ext/dba/"; ac_bdir="ext/dba/"; ac_inc="-I$ac_bdir -I$ac_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
+   
+   
+@@ -32606,7 +33990,7 @@ EOF
+ 
+ 
+   old_IFS=$IFS
+-  for ac_src in dba.c dba_cdb.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db1.c dba_db2.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c dba_qdbm.c $cdb_sources $flat_sources $ini_sources; do
++  for ac_src in dio.c dio_common.c dio_posix.c dio_stream_wrappers.c; do
+   
+       IFS=.
+       set $ac_src
+@@ -32631,7 +34015,7 @@ EOF
+ 
+         ;;
+     esac
+-    EXT_CLI_STATIC="$EXT_CLI_STATIC dba"
++    EXT_CLI_STATIC="$EXT_CLI_STATIC dio"
+   fi
+   
+   
+@@ -32640,32 +34024,12 @@ EOF
+ 
+ 
+   if test "$ext_builddir" = "."; then
+-    PHP_PECL_EXTENSION=dba
++    PHP_PECL_EXTENSION=dio
+     
+   PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
+ 
+   fi
+ 
+-  
+-  
+-    BUILD_DIR="$BUILD_DIR $ext_builddir/libinifile"
+-  
+-
+-  
+-  
+-    BUILD_DIR="$BUILD_DIR $ext_builddir/libcdb"
+-  
+-
+-  
+-  
+-    BUILD_DIR="$BUILD_DIR $ext_builddir/libflatfile"
+-  
+-
+-  
+-  PHP_VAR_SUBST="$PHP_VAR_SUBST DBA_SHARED_LIBADD"
+-
+-else
+-  echo "$ac_t""no" 1>&6
+ fi
+ 
+ 
+@@ -32673,7 +34037,7 @@ 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:34039: checking whether to enable DOM support" >&5
++echo "configure:34041: 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 +34080,7 @@ if test -z "$PHP_LIBXML_DIR"; then
+@@ -32718,7 +34082,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:34084: checking libxml2 install dir" >&5
++echo "configure:34086: 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 +34108,7 @@ if test "$PHP_DOM" != "no"; then
+@@ -32746,7 +34110,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:34112: checking for xml2-config path" >&5
++echo "configure:34114: 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 +34266,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
+@@ -32904,7 +34268,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
  
  
              echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
 -echo "configure:32908: checking whether libxml build works" >&5
-+echo "configure:34270: checking whether libxml build works" >&5
++echo "configure:34272: 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 +34282,7 @@ else
+@@ -32920,7 +34284,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 32924 "configure"
-+#line 34286 "configure"
++#line 34288 "configure"
  #include "confdefs.h"
  
      
-@@ -32931,7 +34293,7 @@ else
+@@ -32931,7 +34295,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:34297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:34299: \"$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 +34716,7 @@ fi
+@@ -33354,7 +34718,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:34720: checking for ENCHANT support" >&5
++echo "configure:34722: 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 +35301,7 @@ EOF
+@@ -33939,7 +35303,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:35305: checking for enchant_broker_set_param in -lenchant" >&5
++echo "configure:35307: 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 +35309,7 @@ else
+@@ -33947,7 +35311,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lenchant  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 33951 "configure"
-+#line 35313 "configure"
++#line 35315 "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 +35320,7 @@ int main() {
+@@ -33958,7 +35322,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:35324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:35326: \"$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 +35367,7 @@ fi
+@@ -34005,7 +35369,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:35371: checking whether to enable EXIF (metadata from images) support" >&5
++echo "configure:35373: 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 +35711,7 @@ fi
+@@ -34349,7 +35713,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:35715: checking for fileinfo support" >&5
++echo "configure:35717: 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 +36061,12 @@ EOF
+@@ -34699,12 +36063,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:36065: checking for $ac_func" >&5
++echo "configure:36067: 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 36070 "configure"
++#line 36072 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -34727,7 +36089,7 @@ $ac_func();
+@@ -34727,7 +36091,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:36093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:36095: \"$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 +36127,7 @@ fi
+@@ -34765,7 +36129,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:36131: checking whether to enable input filter support" >&5
++echo "configure:36133: 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 +36171,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -34809,7 +36173,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:36175: checking pcre install prefix" >&5
++echo "configure:36177: 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 +36198,7 @@ if test "$PHP_FILTER" != "no"; then
+@@ -34836,7 +36200,7 @@ if test "$PHP_FILTER" != "no"; then
          old_CPPFLAGS=$CPPFLAGS
      CPPFLAGS=$INCLUDES
      cat > conftest.$ac_ext <<EOF
 -#line 34840 "configure"
-+#line 36202 "configure"
++#line 36204 "configure"
  #include "confdefs.h"
  
  #include <main/php_config.h>
-@@ -34855,7 +36217,7 @@ else
+@@ -34855,7 +36219,7 @@ else
    rm -rf conftest*
    
        cat > conftest.$ac_ext <<EOF
 -#line 34859 "configure"
-+#line 36221 "configure"
++#line 36223 "configure"
  #include "confdefs.h"
  
  #include <main/php_config.h>
-@@ -35225,7 +36587,7 @@ fi
+@@ -35225,7 +36589,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:36591: checking whether to enable FTP support" >&5
++echo "configure:36593: 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 +36631,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -35269,7 +36633,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:36635: checking OpenSSL dir for FTP" >&5
++echo "configure:36637: 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 +36969,7 @@ EOF
+@@ -35607,7 +36971,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:36973: checking for $ac_word" >&5
++echo "configure:36975: 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 +37174,9 @@ fi
+@@ -35812,9 +37176,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:37178: checking for OpenSSL version" >&5
++echo "configure:37180: checking for OpenSSL version" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 35818 "configure"
-+#line 37180 "configure"
++#line 37182 "configure"
  #include "confdefs.h"
  
  #include <openssl/opensslv.h>
-@@ -35969,7 +37331,7 @@ rm -f conftest*
+@@ -35969,7 +37333,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:37335: checking for CRYPTO_free in -lcrypto" >&5
++echo "configure:37337: 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 +37339,7 @@ else
+@@ -35977,7 +37341,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lcrypto  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 35981 "configure"
-+#line 37343 "configure"
++#line 37345 "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 +37350,7 @@ int main() {
+@@ -35988,7 +37352,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:37354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:37356: \"$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 +37507,7 @@ fi
+@@ -36145,7 +37509,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:37511: checking for SSL_CTX_set_ssl_version in -lssl" >&5
++echo "configure:37513: 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 +37515,7 @@ else
+@@ -36153,7 +37517,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lssl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 36157 "configure"
-+#line 37519 "configure"
++#line 37521 "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 +37526,7 @@ int main() {
+@@ -36164,7 +37528,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:37530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:37532: \"$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 +37645,7 @@ fi
+@@ -36283,7 +37647,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:37649: checking for GD support" >&5
++echo "configure:37651: 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 +37690,7 @@ if test -z "$PHP_JPEG_DIR"; then
+@@ -36328,7 +37692,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:37694: checking for the location of libjpeg" >&5
++echo "configure:37696: 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 +37715,7 @@ if test -z "$PHP_PNG_DIR"; then
+@@ -36353,7 +37717,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:37719: checking for the location of libpng" >&5
++echo "configure:37721: 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 +37740,7 @@ if test -z "$PHP_ZLIB_DIR"; then
+@@ -36378,7 +37742,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:37744: checking for the location of libz" >&5
++echo "configure:37746: 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 +37764,7 @@ fi
+@@ -36402,7 +37766,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:37768: checking for the location of libXpm" >&5
++echo "configure:37770: 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 +37787,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -36425,7 +37789,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:37791: checking for FreeType 2" >&5
++echo "configure:37793: 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 +37810,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -36448,7 +37812,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:37814: checking for T1lib support" >&5
++echo "configure:37816: 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 +37833,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -36471,7 +37835,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:37837: checking whether to enable truetype string function in GD" >&5
++echo "configure:37839: 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 +37856,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -36494,7 +37858,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:37860: checking whether to enable JIS-mapped Japanese font support in GD" >&5
++echo "configure:37862: 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 +37908,12 @@ if test "$PHP_GD" = "yes"; then
+@@ -36546,12 +37910,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:37912: checking for $ac_func" >&5
++echo "configure:37914: 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 37917 "configure"
++#line 37919 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -36574,7 +37936,7 @@ $ac_func();
+@@ -36574,7 +37938,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:37940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:37942: \"$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 +38108,7 @@ EOF
+@@ -36746,7 +38110,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:38112: checking for jpeg_read_header in -ljpeg" >&5
++echo "configure:38114: 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 +38116,7 @@ else
+@@ -36754,7 +38118,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ljpeg  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 36758 "configure"
-+#line 38120 "configure"
++#line 38122 "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 +38127,7 @@ int main() {
+@@ -36765,7 +38129,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:38131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:38133: \"$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 +38409,7 @@ fi
+@@ -37047,7 +38411,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:38413: checking for png_write_image in -lpng" >&5
++echo "configure:38415: 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 +38417,7 @@ else
+@@ -37055,7 +38419,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpng  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 37059 "configure"
-+#line 38421 "configure"
++#line 38423 "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 +38428,7 @@ int main() {
+@@ -37066,7 +38430,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:38432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:38434: \"$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 +38808,7 @@ fi
+@@ -37446,7 +38810,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:38812: checking for XpmFreeXpmImage in -lXpm" >&5
++echo "configure:38814: 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 +38816,7 @@ else
+@@ -37454,7 +38818,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lXpm  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 37458 "configure"
-+#line 38820 "configure"
++#line 38822 "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 +38827,7 @@ int main() {
+@@ -37465,7 +38829,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:38831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:38833: \"$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 +39202,7 @@ fi
+@@ -37840,7 +39204,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:39206: checking for FT_New_Face in -lfreetype" >&5
++echo "configure:39208: 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 +39210,7 @@ else
+@@ -37848,7 +39212,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lfreetype  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 37852 "configure"
-+#line 39214 "configure"
++#line 39216 "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 +39221,7 @@ int main() {
+@@ -37859,7 +39223,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:39225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:39227: \"$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 +39538,7 @@ fi
+@@ -38176,7 +39540,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:39542: checking for T1_StrError in -lt1" >&5
++echo "configure:39544: 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 +39546,7 @@ else
+@@ -38184,7 +39548,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lt1  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 38188 "configure"
-+#line 39550 "configure"
++#line 39552 "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 +39557,7 @@ int main() {
+@@ -38195,7 +39559,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:39561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:39563: \"$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 +40000,7 @@ EOF
+@@ -38638,7 +40002,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:40004: checking for jpeg_read_header in -ljpeg" >&5
++echo "configure:40006: 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 +40008,7 @@ else
+@@ -38646,7 +40010,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ljpeg  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 38650 "configure"
-+#line 40012 "configure"
++#line 40014 "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 +40019,7 @@ int main() {
+@@ -38657,7 +40021,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:40023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:40025: \"$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 +40301,7 @@ fi
+@@ -38939,7 +40303,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:40305: checking for png_write_image in -lpng" >&5
++echo "configure:40307: 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 +40309,7 @@ else
+@@ -38947,7 +40311,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpng  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 38951 "configure"
-+#line 40313 "configure"
++#line 40315 "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 +40320,7 @@ int main() {
+@@ -38958,7 +40322,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:40324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:40326: \"$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 +40700,7 @@ fi
+@@ -39338,7 +40702,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:40704: checking for XpmFreeXpmImage in -lXpm" >&5
++echo "configure:40706: 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 +40708,7 @@ else
+@@ -39346,7 +40710,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lXpm  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 39350 "configure"
-+#line 40712 "configure"
++#line 40714 "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 +40719,7 @@ int main() {
+@@ -39357,7 +40721,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:40723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:40725: \"$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 +41094,7 @@ fi
+@@ -39732,7 +41096,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:41098: checking for FT_New_Face in -lfreetype" >&5
++echo "configure:41100: 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 +41102,7 @@ else
+@@ -39740,7 +41104,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lfreetype  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 39744 "configure"
-+#line 41106 "configure"
++#line 41108 "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 +41113,7 @@ int main() {
+@@ -39751,7 +41115,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:41117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:41119: \"$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 +41430,7 @@ fi
+@@ -40068,7 +41432,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:41434: checking for T1_StrError in -lt1" >&5
++echo "configure:41436: 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 +41438,7 @@ else
+@@ -40076,7 +41440,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lt1  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 40080 "configure"
-+#line 41442 "configure"
++#line 41444 "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 +41449,7 @@ int main() {
+@@ -40087,7 +41451,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:41453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:41455: \"$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 +41824,7 @@ EOF
+@@ -40462,7 +41826,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:41828: checking for gdImageString16 in -lgd" >&5
++echo "configure:41830: 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 +41832,7 @@ else
+@@ -40470,7 +41834,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 40474 "configure"
-+#line 41836 "configure"
++#line 41838 "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 +41843,7 @@ int main() {
+@@ -40481,7 +41845,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:41847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:41849: \"$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 +41972,7 @@ fi
+@@ -40610,7 +41974,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:41976: checking for gdImagePaletteCopy in -lgd" >&5
++echo "configure:41978: 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 +41980,7 @@ else
+@@ -40618,7 +41982,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 40622 "configure"
-+#line 41984 "configure"
++#line 41986 "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 +41991,7 @@ int main() {
+@@ -40629,7 +41993,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:41995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:41997: \"$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 +42120,7 @@ fi
+@@ -40758,7 +42122,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:42124: checking for gdImageCreateFromPng in -lgd" >&5
++echo "configure:42126: 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 +42128,7 @@ else
+@@ -40766,7 +42130,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 40770 "configure"
-+#line 42132 "configure"
++#line 42134 "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 +42139,7 @@ int main() {
+@@ -40777,7 +42141,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:42143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:42145: \"$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 +42268,7 @@ fi
+@@ -40906,7 +42270,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:42272: checking for gdImageCreateFromGif in -lgd" >&5
++echo "configure:42274: 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 +42276,7 @@ else
+@@ -40914,7 +42278,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 40918 "configure"
-+#line 42280 "configure"
++#line 42282 "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 +42287,7 @@ int main() {
+@@ -40925,7 +42289,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:42291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:42293: \"$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 +42416,7 @@ fi
+@@ -41054,7 +42418,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:42420: checking for gdImageGif in -lgd" >&5
++echo "configure:42422: 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 +42424,7 @@ else
+@@ -41062,7 +42426,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 41066 "configure"
-+#line 42428 "configure"
++#line 42430 "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 +42435,7 @@ int main() {
+@@ -41073,7 +42437,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:42439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:42441: \"$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 +42564,7 @@ fi
+@@ -41202,7 +42566,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:42568: checking for gdImageWBMP in -lgd" >&5
++echo "configure:42570: 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 +42572,7 @@ else
+@@ -41210,7 +42574,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 41214 "configure"
-+#line 42576 "configure"
++#line 42578 "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 +42583,7 @@ int main() {
+@@ -41221,7 +42585,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:42587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:42589: \"$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 +42712,7 @@ fi
+@@ -41350,7 +42714,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:42716: checking for gdImageCreateFromJpeg in -lgd" >&5
++echo "configure:42718: 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 +42720,7 @@ else
+@@ -41358,7 +42722,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 41362 "configure"
-+#line 42724 "configure"
++#line 42726 "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 +42731,7 @@ int main() {
+@@ -41369,7 +42733,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:42735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:42737: \"$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 +42860,7 @@ fi
+@@ -41498,7 +42862,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:42864: checking for gdImageCreateFromXpm in -lgd" >&5
++echo "configure:42866: 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 +42868,7 @@ else
+@@ -41506,7 +42870,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 41510 "configure"
-+#line 42872 "configure"
++#line 42874 "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 +42879,7 @@ int main() {
+@@ -41517,7 +42881,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:42883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:42885: \"$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 +43008,7 @@ fi
+@@ -41646,7 +43010,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:43012: checking for gdImageCreateFromGd2 in -lgd" >&5
++echo "configure:43014: 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 +43016,7 @@ else
+@@ -41654,7 +43018,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 41658 "configure"
-+#line 43020 "configure"
++#line 43022 "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 +43027,7 @@ int main() {
+@@ -41665,7 +43029,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:43031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:43033: \"$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 +43156,7 @@ fi
+@@ -41794,7 +43158,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:43160: checking for gdImageCreateTrueColor in -lgd" >&5
++echo "configure:43162: 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 +43164,7 @@ else
+@@ -41802,7 +43166,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 41806 "configure"
-+#line 43168 "configure"
++#line 43170 "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 +43175,7 @@ int main() {
+@@ -41813,7 +43177,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:43179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:43181: \"$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 +43304,7 @@ fi
+@@ -41942,7 +43306,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:43308: checking for gdImageSetTile in -lgd" >&5
++echo "configure:43310: 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 +43312,7 @@ else
+@@ -41950,7 +43314,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 41954 "configure"
-+#line 43316 "configure"
++#line 43318 "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 +43323,7 @@ int main() {
+@@ -41961,7 +43325,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:43327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:43329: \"$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 +43452,7 @@ fi
+@@ -42090,7 +43454,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:43456: checking for gdImageEllipse in -lgd" >&5
++echo "configure:43458: 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 +43460,7 @@ else
+@@ -42098,7 +43462,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 42102 "configure"
-+#line 43464 "configure"
++#line 43466 "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 +43471,7 @@ int main() {
+@@ -42109,7 +43473,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:43475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:43477: \"$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 +43600,7 @@ fi
+@@ -42238,7 +43602,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:43604: checking for gdImageSetBrush in -lgd" >&5
++echo "configure:43606: 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 +43608,7 @@ else
+@@ -42246,7 +43610,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 42250 "configure"
-+#line 43612 "configure"
++#line 43614 "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 +43619,7 @@ int main() {
+@@ -42257,7 +43621,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:43623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:43625: \"$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 +43748,7 @@ fi
+@@ -42386,7 +43750,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:43752: checking for gdImageStringTTF in -lgd" >&5
++echo "configure:43754: 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 +43756,7 @@ else
+@@ -42394,7 +43758,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 42398 "configure"
-+#line 43760 "configure"
++#line 43762 "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 +43767,7 @@ int main() {
+@@ -42405,7 +43769,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:43771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:43773: \"$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 +43896,7 @@ fi
+@@ -42534,7 +43898,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:43900: checking for gdImageStringFT in -lgd" >&5
++echo "configure:43902: 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 +43904,7 @@ else
+@@ -42542,7 +43906,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 42546 "configure"
-+#line 43908 "configure"
++#line 43910 "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 +43915,7 @@ int main() {
+@@ -42553,7 +43917,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:43919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:43921: \"$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 +44044,7 @@ fi
+@@ -42682,7 +44046,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:44048: checking for gdImageStringFTEx in -lgd" >&5
++echo "configure:44050: 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 +44052,7 @@ else
+@@ -42690,7 +44054,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 42694 "configure"
-+#line 44056 "configure"
++#line 44058 "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 +44063,7 @@ int main() {
+@@ -42701,7 +44065,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:44067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:44069: \"$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 +44192,7 @@ fi
+@@ -42830,7 +44194,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:44196: checking for gdImageColorClosestHWB in -lgd" >&5
++echo "configure:44198: 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 +44200,7 @@ else
+@@ -42838,7 +44202,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 42842 "configure"
-+#line 44204 "configure"
++#line 44206 "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 +44211,7 @@ int main() {
+@@ -42849,7 +44213,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:44215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:44217: \"$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 +44340,7 @@ fi
+@@ -42978,7 +44342,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:44344: checking for gdImageColorResolve in -lgd" >&5
++echo "configure:44346: 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 +44348,7 @@ else
+@@ -42986,7 +44350,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 42990 "configure"
-+#line 44352 "configure"
++#line 44354 "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 +44359,7 @@ int main() {
+@@ -42997,7 +44361,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:44363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:44365: \"$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 +44488,7 @@ fi
+@@ -43126,7 +44490,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:44492: checking for gdImageGifCtx in -lgd" >&5
++echo "configure:44494: 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 +44496,7 @@ else
+@@ -43134,7 +44498,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 43138 "configure"
-+#line 44500 "configure"
++#line 44502 "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 +44507,7 @@ int main() {
+@@ -43145,7 +44509,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:44511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:44513: \"$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 +44636,7 @@ fi
+@@ -43274,7 +44638,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:44640: checking for gdCacheCreate in -lgd" >&5
++echo "configure:44642: 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 +44644,7 @@ else
+@@ -43282,7 +44646,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 43286 "configure"
-+#line 44648 "configure"
++#line 44650 "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 +44655,7 @@ int main() {
+@@ -43293,7 +44657,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:44659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:44661: \"$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 +44784,7 @@ fi
+@@ -43422,7 +44786,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:44788: checking for gdFontCacheShutdown in -lgd" >&5
++echo "configure:44790: 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 +44792,7 @@ else
+@@ -43430,7 +44794,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 43434 "configure"
-+#line 44796 "configure"
++#line 44798 "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 +44803,7 @@ int main() {
+@@ -43441,7 +44805,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:44807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:44809: \"$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 +44932,7 @@ fi
+@@ -43570,7 +44934,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:44936: checking for gdFreeFontCache in -lgd" >&5
++echo "configure:44938: 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 +44940,7 @@ else
+@@ -43578,7 +44942,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 43582 "configure"
-+#line 44944 "configure"
++#line 44946 "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 +44951,7 @@ int main() {
+@@ -43589,7 +44953,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:44955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:44957: \"$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 +45080,7 @@ fi
+@@ -43718,7 +45082,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:45084: checking for gdFontCacheMutexSetup in -lgd" >&5
++echo "configure:45086: 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 +45088,7 @@ else
+@@ -43726,7 +45090,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 43730 "configure"
-+#line 45092 "configure"
++#line 45094 "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 +45099,7 @@ int main() {
+@@ -43737,7 +45101,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:45103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:45105: \"$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 +45228,7 @@ fi
+@@ -43866,7 +45230,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:45232: checking for gdNewDynamicCtxEx in -lgd" >&5
++echo "configure:45234: 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 +45236,7 @@ else
+@@ -43874,7 +45238,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 43878 "configure"
-+#line 45240 "configure"
++#line 45242 "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 +45247,7 @@ int main() {
+@@ -43885,7 +45249,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:45251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:45253: \"$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 +45302,7 @@ fi
+@@ -43940,7 +45304,7 @@ fi
          old_CPPFLAGS=$CPPFLAGS
    CPPFLAGS=-I$GD_INCLUDE
    cat > conftest.$ac_ext <<EOF
 -#line 43944 "configure"
-+#line 45306 "configure"
++#line 45308 "configure"
  #include "confdefs.h"
  
  #include <gd.h>
-@@ -43954,7 +45316,7 @@ ctx->gd_free = 1;
+@@ -43954,7 +45318,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:45320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:45322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      cat >> confdefs.h <<\EOF
-@@ -44285,7 +45647,7 @@ EOF
+@@ -44285,7 +45649,7 @@ EOF
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 44289 "configure"
-+#line 45651 "configure"
++#line 45653 "configure"
  #include "confdefs.h"
  
      char foobar () {}
-@@ -44296,7 +45658,7 @@ else
+@@ -44296,7 +45660,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:45662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:45664: \"$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 +45809,7 @@ fi
+@@ -44447,7 +45811,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:45813: checking for gdImageCreate in -lgd" >&5
++echo "configure:45815: 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 +45817,7 @@ else
+@@ -44455,7 +45819,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgd  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 44459 "configure"
-+#line 45821 "configure"
++#line 45823 "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 +45828,7 @@ int main() {
+@@ -44466,7 +45830,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:45832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:45834: \"$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 +45893,7 @@ fi
+@@ -44531,7 +45895,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:45897: checking for GNU gettext support" >&5
++echo "configure:45899: 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 +45948,7 @@ if test "$PHP_GETTEXT" != "no"; then
+@@ -44586,7 +45950,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:45952: checking for bindtextdomain in -lintl" >&5
++echo "configure:45954: 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 +45956,7 @@ else
+@@ -44594,7 +45958,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lintl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 44598 "configure"
-+#line 45960 "configure"
++#line 45962 "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 +45967,7 @@ int main() {
+@@ -44605,7 +45969,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:45971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:45973: \"$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 +45989,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+@@ -44627,7 +45991,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
  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:45993: checking for bindtextdomain in -lc" >&5
++echo "configure:45995: 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 +45997,7 @@ else
+@@ -44635,7 +45999,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lc  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 44639 "configure"
-+#line 46001 "configure"
++#line 46003 "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 +46008,7 @@ int main() {
+@@ -44646,7 +46010,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:46012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:46014: \"$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 +46472,7 @@ EOF
+@@ -45110,7 +46474,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:46476: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
++echo "configure:46478: 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 +46480,7 @@ else
+@@ -45118,7 +46482,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 45122 "configure"
-+#line 46484 "configure"
++#line 46486 "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 +46491,7 @@ int main() {
+@@ -45129,7 +46493,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:46495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:46497: \"$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 +46515,7 @@ else
+@@ -45153,7 +46517,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:46519: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
++echo "configure:46521: 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 +46523,7 @@ else
+@@ -45161,7 +46525,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 45165 "configure"
-+#line 46527 "configure"
++#line 46529 "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 +46534,7 @@ int main() {
+@@ -45172,7 +46536,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:46538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:46540: \"$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 +46558,7 @@ else
+@@ -45196,7 +46560,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:46562: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5
++echo "configure:46564: 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 +46566,7 @@ else
+@@ -45204,7 +46568,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 45208 "configure"
-+#line 46570 "configure"
++#line 46572 "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 +46577,7 @@ int main() {
+@@ -45215,7 +46579,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:46581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:46583: \"$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 +46601,7 @@ else
+@@ -45239,7 +46603,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:46605: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5
++echo "configure:46607: 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 +46609,7 @@ else
-   ac_save_LIBS="$LIBS"
- LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 45251 "configure"
-+#line 46613 "configure"
+@@ -45247,7 +46611,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-l$GETTEXT_CHECK_IN_LIB  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 45251 "configure"
++#line 46615 "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 +46622,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:46626: \"$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 +46653,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:46657: 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 +46801,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:46805: 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 +46809,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgmp  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 45449 "configure"
++#line 46813 "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 +46820,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:46824: \"$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 +46945,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:46949: 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 +46953,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgmp  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 45593 "configure"
++#line 46957 "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 +46964,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:46968: \"$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 +47436,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:47440: 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 +47480,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:47484: 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 +47538,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:47542: 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 +47548,7 @@ else
+   ac_cv_c_bigendian_php=unknown
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 46188 "configure"
++#line 47552 "configure"
+ #include "confdefs.h"
+ 
+ int main(void)
+@@ -46200,7 +47564,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:47568: \"$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 +47589,7 @@ EOF
+ 
+ 
+   echo $ac_n "checking size of short""... $ac_c" 1>&6
+-echo "configure:46229: checking size of short" >&5
++echo "configure:47593: 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 +47597,19 @@ else
+   ac_cv_sizeof_short=2
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 46237 "configure"
++#line 47601 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-int main()
++#include <sys/types.h>
++main()
+ {
+   FILE *f=fopen("conftestval", "w");
+-  if (!f) return(1);
++  if (!f) exit(1);
+   fprintf(f, "%d\n", sizeof(short));
+-  return(0);
++  exit(0);
+ }
+ 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:47613: \"$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 +47629,7 @@ EOF
+ 
+ 
+   echo $ac_n "checking size of int""... $ac_c" 1>&6
+-echo "configure:46268: checking size of int" >&5
++echo "configure:47633: 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 +47637,19 @@ else
+   ac_cv_sizeof_int=4
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 46276 "configure"
++#line 47641 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-int main()
++#include <sys/types.h>
++main()
+ {
+   FILE *f=fopen("conftestval", "w");
+-  if (!f) return(1);
++  if (!f) exit(1);
+   fprintf(f, "%d\n", sizeof(int));
+-  return(0);
++  exit(0);
+ }
+ 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:47653: \"$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 +47669,7 @@ EOF
+ 
+ 
+   echo $ac_n "checking size of long""... $ac_c" 1>&6
+-echo "configure:46307: checking size of long" >&5
++echo "configure:47673: 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 +47677,19 @@ else
+   ac_cv_sizeof_long=4
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 46315 "configure"
++#line 47681 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-int main()
++#include <sys/types.h>
++main()
+ {
+   FILE *f=fopen("conftestval", "w");
+-  if (!f) return(1);
++  if (!f) exit(1);
+   fprintf(f, "%d\n", sizeof(long));
+-  return(0);
++  exit(0);
+ }
+ 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:47693: \"$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 +47709,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:47713: 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 +47717,19 @@ else
+   ac_cv_sizeof_long_long=8
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 46354 "configure"
++#line 47721 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-int main()
++#include <sys/types.h>
++main()
+ {
+   FILE *f=fopen("conftestval", "w");
+-  if (!f) return(1);
++  if (!f) exit(1);
+   fprintf(f, "%d\n", sizeof(long long));
+-  return(0);
++  exit(0);
+ }
+ 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:47733: \"$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 +48078,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:48082: 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 +48139,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:48143: 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 48148 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char iconv(); below.  */
+@@ -46799,7 +48167,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:48171: \"$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 +48188,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:48192: 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 48197 "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 +46620,7 @@ int main() {
- bind_textdomain_codeset()
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char libiconv(); below.  */
+@@ -46848,7 +48216,7 @@ libiconv();
+ 
  ; 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:46624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:46852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:48220: \"$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"
+   eval "ac_cv_func_libiconv=yes"
  else
-@@ -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: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 +46799,7 @@ if test "$PHP_GMP" != "no"; then
+@@ -47004,7 +48372,7 @@ EOF
    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:46803: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5
- ac_lib_var=`echo gmp'_'__gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'`
+   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:48376: 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
-@@ -45445,7 +46807,7 @@ else
+@@ -47012,7 +48380,7 @@ else
    ac_save_LIBS="$LIBS"
- LIBS="-lgmp  $LIBS"
+ LIBS="-l$iconv_lib_name  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 45449 "configure"
-+#line 46811 "configure"
+-#line 47016 "configure"
++#line 48384 "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 +46818,7 @@ int main() {
- __gmp_randinit_lc_2exp_size()
+@@ -47023,7 +48391,7 @@ int main() {
+ libiconv()
  ; 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:46822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:47027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:48395: \"$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 +46943,7 @@ else
+@@ -47164,7 +48532,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:46947: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5
- ac_lib_var=`echo gmp'_'gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'`
+   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:48536: 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
-@@ -45589,7 +46951,7 @@ else
+@@ -47172,7 +48540,7 @@ else
    ac_save_LIBS="$LIBS"
- LIBS="-lgmp  $LIBS"
+ LIBS="-l$iconv_lib_name  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 45593 "configure"
-+#line 46955 "configure"
+-#line 47176 "configure"
++#line 48544 "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 +46962,7 @@ int main() {
- gmp_randinit_lc_2exp_size()
+@@ -47183,7 +48551,7 @@ int main() {
+ iconv()
  ; 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:46966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:47187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:48555: \"$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 +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: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 +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: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 +47536,7 @@ EOF
+@@ -47394,16 +48762,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:48766: checking if iconv is glibc's" >&5
+     cat > conftest.$ac_ext <<EOF
+-#line 47400 "configure"
++#line 48768 "configure"
+ #include "confdefs.h"
+ #include <gnu/libc-version.h>
+ int main() {
+ gnu_get_libc_version();
+ ; 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:48775: \"$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 +48789,7 @@ rm -f conftest*
  
-   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: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 +47546,7 @@ else
-   ac_cv_c_bigendian_php=unknown
+     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:48793: checking if using GNU libiconv" >&5
+       php_iconv_old_ld="$LDFLAGS"
+       LDFLAGS="-liconv $LDFLAGS"
+       if test "$cross_compiling" = yes; then
+@@ -47431,7 +48799,7 @@ echo "configure:47425: checking if using
+       
  else
    cat > conftest.$ac_ext <<EOF
--#line 46188 "configure"
-+#line 47550 "configure"
+-#line 47435 "configure"
++#line 48803 "configure"
  #include "confdefs.h"
  
- int main(void)
-@@ -46200,7 +47562,7 @@ int main(void)
+ #include <$PHP_ICONV_H_PATH>
+@@ -47441,7 +48809,7 @@ int main() {
  }
-   
+       
  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:47566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-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:48813: \"$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 +47587,7 @@ EOF
+   
+         echo "$ac_t""yes" 1>&6
+@@ -47463,16 +48831,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:48835: checking if iconv is Konstantin Chuguev's" >&5
+       cat > conftest.$ac_ext <<EOF
+-#line 47469 "configure"
++#line 48837 "configure"
+ #include "confdefs.h"
+ #include <iconv.h>
+ int main() {
+ iconv_ccs_init(NULL, NULL);
+ ; 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:48844: \"$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 +48859,18 @@ rm -f conftest*
  
-   echo $ac_n "checking size of short""... $ac_c" 1>&6
--echo "configure:46229: 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 +47595,19 @@ else
-   ac_cv_sizeof_short=2
+     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:48863: checking if using IBM iconv" >&5
+       php_iconv_old_ld="$LDFLAGS"
+       LDFLAGS="-liconv $LDFLAGS"
+       cat > conftest.$ac_ext <<EOF
+-#line 47499 "configure"
++#line 48867 "configure"
+ #include "confdefs.h"
+ #include <iconv.h>
+ int main() {
+ cstoccsid("");
+ ; 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:48874: \"$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 +49056,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:49060: checking if iconv supports errno" >&5
+     if test "$cross_compiling" = yes; then
+   
+       echo "$ac_t""no" 1>&6
+@@ -47702,7 +49070,7 @@ EOF
+     
  else
    cat > conftest.$ac_ext <<EOF
--#line 46237 "configure"
-+#line 47599 "configure"
+-#line 47706 "configure"
++#line 49074 "configure"
  #include "confdefs.h"
- #include <stdio.h>
--int main()
-+#include <sys/types.h>
-+main()
- {
-   FILE *f=fopen("conftestval", "w");
--  if (!f) return(1);
-+  if (!f) exit(1);
-   fprintf(f, "%d\n", sizeof(short));
--  return(0);
-+  exit(0);
+ 
+ #include <$PHP_ICONV_H_PATH>
+@@ -47723,7 +49091,7 @@ int main() {
  }
+     
  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:47611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-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:49095: \"$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 +47627,7 @@ EOF
+   
+       echo "$ac_t""yes" 1>&6
+@@ -47755,9 +49123,9 @@ fi
  
  
-   echo $ac_n "checking size of int""... $ac_c" 1>&6
--echo "configure:46268: 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 "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:49127: checking if your cpp allows macro usage in include lines" >&5
+     cat > conftest.$ac_ext <<EOF
+-#line 47761 "configure"
++#line 49129 "configure"
+ #include "confdefs.h"
+ 
+ #define FOO <$PHP_ICONV_H_PATH>
+@@ -47767,7 +49135,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:49139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   
+       echo "$ac_t""yes" 1>&6
+@@ -48123,7 +49491,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:49495: 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 +49535,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:49539: 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 +49558,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:49562: 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 +49962,7 @@ EOF
+     done
+ 
+         cat > conftest.$ac_ext <<EOF
+-#line 48598 "configure"
++#line 49966 "configure"
+ #include "confdefs.h"
+ #include <$IMAP_INC_DIR/mail.h>
+ EOF
+@@ -48614,12 +49982,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:49986: 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
-@@ -46272,18 +47635,19 @@ else
-   ac_cv_sizeof_int=4
  else
    cat > conftest.$ac_ext <<EOF
--#line 46276 "configure"
-+#line 47639 "configure"
+-#line 48623 "configure"
++#line 49991 "configure"
  #include "confdefs.h"
+ 
  #include <stdio.h>
--int main()
-+#include <sys/types.h>
-+main()
- {
-   FILE *f=fopen("conftestval", "w");
--  if (!f) return(1);
-+  if (!f) exit(1);
-   fprintf(f, "%d\n", sizeof(int));
--  return(0);
-+  exit(0);
- }
+@@ -48632,7 +50000,7 @@ int main() {
+       
+ ; return 0; }
  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: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 +47667,7 @@ EOF
- 
- 
-   echo $ac_n "checking size of long""... $ac_c" 1>&6
--echo "configure:46307: checking size of long" >&5
-+echo "configure:47671: checking size of long" >&5
- if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
+-if { (eval echo configure:48636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:50004: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   
+         ac_cv_utf8_mime2text=old
+@@ -48661,12 +50029,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:50033: 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
-@@ -46311,18 +47675,19 @@ else
-   ac_cv_sizeof_long=4
  else
    cat > conftest.$ac_ext <<EOF
--#line 46315 "configure"
-+#line 47679 "configure"
+-#line 48670 "configure"
++#line 50038 "configure"
  #include "confdefs.h"
- #include <stdio.h>
--int main()
-+#include <sys/types.h>
-+main()
- {
-   FILE *f=fopen("conftestval", "w");
--  if (!f) return(1);
-+  if (!f) exit(1);
-   fprintf(f, "%d\n", sizeof(long));
--  return(0);
-+  exit(0);
- }
+ 
+ #include <c-client.h>
+@@ -48677,7 +50045,7 @@ int main() {
+       
+ ; return 0; }
  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: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 +47707,7 @@ EOF
+-if { (eval echo configure:48681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:50049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   
+          ac_cv_u8t_decompose=yes
+@@ -48707,7 +50075,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 50079 "configure"
+ #include "confdefs.h"
  
+ #include "imap4r1.h"
+@@ -48826,7 +50194,7 @@ rm -f conftest*
+   done
  
-   echo $ac_n "checking size of long long""... $ac_c" 1>&6
--echo "configure:46346: 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 "checking for pam_start in -lpam""... $ac_c" 1>&6
+-echo "configure:48830: checking for pam_start in -lpam" >&5
++echo "configure:50198: 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
- else
-@@ -46350,18 +47715,19 @@ else
-   ac_cv_sizeof_long_long=8
- else
-   cat > conftest.$ac_ext <<EOF
--#line 46354 "configure"
-+#line 47719 "configure"
+@@ -48834,7 +50202,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpam  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 48838 "configure"
++#line 50206 "configure"
  #include "confdefs.h"
- #include <stdio.h>
--int main()
-+#include <sys/types.h>
-+main()
- {
-   FILE *f=fopen("conftestval", "w");
--  if (!f) return(1);
-+  if (!f) exit(1);
-   fprintf(f, "%d\n", sizeof(long long));
--  return(0);
-+  exit(0);
- }
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -48845,7 +50213,7 @@ int main() {
+ pam_start()
+ ; return 0; }
  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: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`
+-if { (eval echo configure:48849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:50217: \"$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
-@@ -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: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 +48137,12 @@ if test "$PHP_ICONV" != "no"; then
+@@ -49000,7 +50368,7 @@ fi
+   done
  
-         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:48141: checking for iconv" >&5
- if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then
+   echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
+-echo "configure:49004: checking for crypt in -lcrypt" >&5
++echo "configure:50372: 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
- else
-   cat > conftest.$ac_ext <<EOF
--#line 46780 "configure"
-+#line 48146 "configure"
+@@ -49008,7 +50376,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lcrypt  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 49012 "configure"
++#line 50380 "configure"
  #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-     which can conflict with char iconv(); below.  */
-@@ -46799,7 +48165,7 @@ iconv();
- 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -49019,7 +50387,7 @@ int main() {
+ crypt()
  ; 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:48169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:49023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:50391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
-   eval "ac_cv_func_iconv=yes"
+   eval "ac_cv_lib_$ac_lib_var=yes"
  else
-@@ -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:48190: checking for libiconv" >&5
- if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then
+@@ -49223,7 +50591,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:50595: 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
-   cat > conftest.$ac_ext <<EOF
--#line 46829 "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 +48214,7 @@ libiconv();
+@@ -49592,7 +50960,7 @@ else
  
- ; return 0; }
+   else
+     cat > conftest.$ac_ext <<EOF
+-#line 49596 "configure"
++#line 50964 "configure"
+ #include "confdefs.h"
+ #include <$IMAP_INC_DIR/linkage.h>
  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: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"
+@@ -49633,7 +51001,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:51005: 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
-@@ -47004,7 +48370,7 @@ EOF
+@@ -49838,9 +51206,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:51210: checking for OpenSSL version" >&5
+     cat > conftest.$ac_ext <<EOF
+-#line 49844 "configure"
++#line 51212 "configure"
+ #include "confdefs.h"
+ 
+ #include <openssl/opensslv.h>
+@@ -49995,7 +51363,7 @@ rm -f conftest*
    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:48374: checking for libiconv in -l$iconv_lib_name" >&5
- ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'`
+   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:51367: 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
-@@ -47012,7 +48378,7 @@ else
+@@ -50003,7 +51371,7 @@ else
    ac_save_LIBS="$LIBS"
- LIBS="-l$iconv_lib_name  $LIBS"
+ LIBS="-lcrypto  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 47016 "configure"
-+#line 48382 "configure"
+-#line 50007 "configure"
++#line 51375 "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 +48389,7 @@ int main() {
- libiconv()
+@@ -50014,7 +51382,7 @@ int main() {
+ CRYPTO_free()
  ; 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:48393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:50018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:51386: \"$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 +48530,7 @@ else
+@@ -50171,7 +51539,7 @@ fi
    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:48534: checking for iconv in -l$iconv_lib_name" >&5
- ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'`
+   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:51543: 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
-@@ -47172,7 +48538,7 @@ else
+@@ -50179,7 +51547,7 @@ else
    ac_save_LIBS="$LIBS"
- LIBS="-l$iconv_lib_name  $LIBS"
+ LIBS="-lssl  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 47176 "configure"
-+#line 48542 "configure"
+-#line 50183 "configure"
++#line 51551 "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 +48549,7 @@ int main() {
- iconv()
+@@ -50190,7 +51558,7 @@ int main() {
+ SSL_CTX_set_ssl_version()
  ; 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:48553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:50194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:51562: \"$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 +48760,16 @@ else
-     fi 
+@@ -50309,7 +51677,7 @@ else
  
-     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:48764: checking if iconv is glibc's" >&5
+   elif test -f "$IMAP_INC_DIR/linkage.c"; then
      cat > conftest.$ac_ext <<EOF
--#line 47400 "configure"
-+#line 48766 "configure"
+-#line 50313 "configure"
++#line 51681 "configure"
  #include "confdefs.h"
- #include <gnu/libc-version.h>
- int main() {
- gnu_get_libc_version();
- ; return 0; }
+ #include <$IMAP_INC_DIR/linkage.c>
  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:48773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
+@@ -50340,7 +51708,7 @@ rm -f conftest*
    
-       echo "$ac_t""yes" 1>&6
-@@ -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:48791: checking if using GNU libiconv" >&5
-       php_iconv_old_ld="$LDFLAGS"
-       LDFLAGS="-liconv $LDFLAGS"
-       if test "$cross_compiling" = yes; then
-@@ -47431,7 +48797,7 @@ echo "configure:47425: checking if using GNU libiconv" >&5
-       
  else
    cat > conftest.$ac_ext <<EOF
--#line 47435 "configure"
-+#line 48801 "configure"
+-#line 50344 "configure"
++#line 51712 "configure"
  #include "confdefs.h"
  
- #include <$PHP_ICONV_H_PATH>
-@@ -47441,7 +48807,7 @@ int main() {
- }
-       
+     
+@@ -50373,7 +51741,7 @@ else
+     }
+   
  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:48811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-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:51745: \"$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 +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:48833: checking if iconv is Konstantin Chuguev's" >&5
-       cat > conftest.$ac_ext <<EOF
--#line 47469 "configure"
-+#line 48835 "configure"
+     LIBS=$old_LIBS
+@@ -50409,7 +51777,7 @@ fi
+   
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 50413 "configure"
++#line 51781 "configure"
  #include "confdefs.h"
- #include <iconv.h>
- int main() {
- iconv_ccs_init(NULL, NULL);
- ; return 0; }
+ 
+     
+@@ -50442,7 +51810,7 @@ else
+     }
+   
  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:48842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
+-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:51814: \"$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
-@@ -47491,18 +48857,18 @@ rm -f conftest*
+     LIBS=$old_LIBS
+@@ -50469,7 +51837,7 @@ fi
  
-     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:48861: checking if using IBM iconv" >&5
-       php_iconv_old_ld="$LDFLAGS"
-       LDFLAGS="-liconv $LDFLAGS"
-       cat > conftest.$ac_ext <<EOF
--#line 47499 "configure"
-+#line 48865 "configure"
+ 
+     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:51841: checking whether rfc822_output_address_list function present" >&5
+     
+   old_LIBS=$LIBS
+   LIBS="
+@@ -50481,7 +51849,7 @@ echo "configure:50473: checking whether
+   
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 50485 "configure"
++#line 51853 "configure"
  #include "confdefs.h"
- #include <iconv.h>
- int main() {
- cstoccsid("");
- ; return 0; }
+ 
+     
+@@ -50517,7 +51885,7 @@ else
+     }
+   
  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:48872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
+-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:51889: \"$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
-@@ -47688,7 +49054,7 @@ EOF
-     esac
+     LIBS=$old_LIBS
+@@ -50546,7 +51914,7 @@ fi
  
-     echo $ac_n "checking if iconv supports errno""... $ac_c" 1>&6
--echo "configure:47692: 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 +49068,7 @@ EOF
+ 
+     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:51918: checking whether build with IMAP works" >&5
      
+   
+   old_LIBS=$LIBS
+@@ -50557,7 +51925,7 @@ echo "configure:50550: checking whether
+   
  else
    cat > conftest.$ac_ext <<EOF
--#line 47706 "configure"
-+#line 49072 "configure"
+-#line 50561 "configure"
++#line 51929 "configure"
  #include "confdefs.h"
  
- #include <$PHP_ICONV_H_PATH>
-@@ -47723,7 +49089,7 @@ int main() {
- }
      
+@@ -50590,7 +51958,7 @@ else
+     }
+   
  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:49093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-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:51962: \"$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 +49121,9 @@ fi
+     LIBS=$old_LIBS
+@@ -50622,7 +51990,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:51994: 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 +52137,7 @@ if test "$PHP_INTERBASE" != "no"; then
+   done
  
-     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:49125: checking if your cpp allows macro usage in include lines" >&5
-     cat > conftest.$ac_ext <<EOF
--#line 47761 "configure"
-+#line 49127 "configure"
+   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:52141: 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 +52145,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lfbclient  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 50781 "configure"
++#line 52149 "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 +52156,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:52160: \"$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 +52283,7 @@ else
+   done
  
- #define FOO <$PHP_ICONV_H_PATH>
-@@ -47767,7 +49133,7 @@ int main() {
+   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:52287: 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 +52291,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgds  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 50927 "configure"
++#line 52295 "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 +52302,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:52306: \"$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 +52429,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:52433: 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 +52437,7 @@ else
+   ac_save_LIBS="$LIBS"
+ LIBS="-lib_util  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 51073 "configure"
++#line 52441 "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 +52448,7 @@ int main() {
+ isc_detach_database()
  ; return 0; }
  EOF
--if { (eval echo configure:47771: \"$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
+-if { (eval echo configure:51084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:52452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
-   
-       echo "$ac_t""yes" 1>&6
-@@ -48123,7 +49489,7 @@ fi
- php_with_imap=no
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -51557,7 +52925,7 @@ fi
+ php_enable_intl=no
  
- echo $ac_n "checking for IMAP support""... $ac_c" 1>&6
--echo "configure:48127: 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 +49533,7 @@ echo "$ac_t""$ext_output" 1>&6
- php_with_kerberos=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:52929: 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 +52997,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:53001: 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 +53035,7 @@ fi
+   fi
  
- echo $ac_n "checking for IMAP Kerberos support""... $ac_c" 1>&6
--echo "configure:48171: 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 +49556,7 @@ echo "$ac_t""$ext_output" 1>&6
- php_with_imap_ssl=no
+   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:53039: checking for location of ICU headers and libraries" >&5
  
- echo $ac_n "checking for IMAP SSL support""... $ac_c" 1>&6
--echo "configure:48194: 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 +49960,7 @@ EOF
-     done
+     icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null`
+   if test "$?" != "0" || test -z "$icu_install_prefix"; then
+@@ -51677,7 +53045,7 @@ echo "configure:51671: checking for loca
+     echo "$ac_t""$icu_install_prefix" 1>&6
  
-         cat > conftest.$ac_ext <<EOF
--#line 48598 "configure"
-+#line 49964 "configure"
+         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:53049: checking for ICU 3.4 or greater" >&5
+     icu_version_full=`$ICU_CONFIG --version`
+     ac_IFS=$IFS
+     IFS="."
+@@ -51834,7 +53202,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:53206: 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 +53234,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:53238: 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 +53245,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
+ 
+ cat > conftest.$ac_ext << EOF
+ 
+-#line 51881 "configure"
++#line 53249 "configure"
  #include "confdefs.h"
- #include <$IMAP_INC_DIR/mail.h>
+ 
+ int main(){return(0);}
  EOF
-@@ -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:49984: checking for utf8_mime2text signature" >&5
- if eval "test \"`echo '$''{'ac_cv_utf8_mime2text'+set}'`\" = set"; then
+-if { (eval echo configure:51886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:53254: \"$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 +53276,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:53280: 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:53285: 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 +53290,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:53294: \"$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 +53309,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:53313: 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 +53340,8 @@ else
+   fi
+ fi
+ 
+-for ac_declaration in \
+-   ''\
+-   '#include <stdlib.h>' \
+-   'extern "C" void std::exit (int) throw (); using std::exit;' \
+-   'extern "C" void std::exit (int); using std::exit;' \
+-   'extern "C" void exit (int) throw ();' \
+-   'extern "C" void exit (int);' \
+-   'void exit (int);'
+-do
+-  cat > conftest.$ac_ext <<EOF
+-#line 51986 "configure"
+-#include "confdefs.h"
+-#include <stdlib.h>
+-$ac_declaration
+-int main() {
+-exit (42);
+-; return 0; }
+-EOF
+-if { (eval echo configure:51994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  :
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  continue
+-fi
+-rm -f conftest*
+-  cat > conftest.$ac_ext <<EOF
+-#line 52004 "configure"
+-#include "confdefs.h"
+-$ac_declaration
+-int main() {
+-exit (42);
+-; return 0; }
+-EOF
+-if { (eval echo configure:52011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
+-  break
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-fi
+-rm -f conftest*
+-done
+-if test -n "$ac_declaration"; then
+-  echo '#ifdef __cplusplus' >>confdefs.h
+-  echo $ac_declaration      >>confdefs.h
+-  echo '#endif'             >>confdefs.h
+-fi
+-
+-
+     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:53345: 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
- else
+@@ -52037,12 +53354,12 @@ ac_link='${CXX-g++} -o conftest${ac_exee
+ cross_compiling=$ac_cv_prog_cxx_cross
+   CXXCPP="${CXX-g++} -E"
    cat > conftest.$ac_ext <<EOF
--#line 48623 "configure"
-+#line 49989 "configure"
+-#line 52041 "configure"
++#line 53358 "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:53363: \"$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 +53917,7 @@ fi
+ php_enable_json=yes
  
- #include <stdio.h>
-@@ -48632,7 +49998,7 @@ int main() {
-       
- ; return 0; }
+ 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:53921: 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 +53963,12 @@ if test "$PHP_JSON" != "no"; then
  EOF
--if { (eval echo configure:48636: \"$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 +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:50031: checking for U8T_DECOMPOSE" >&5
- if eval "test \"`echo '$''{'ac_cv_u8t_canonical'+set}'`\" = set"; then
+ 
+   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:53967: 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 48670 "configure"
-+#line 50036 "configure"
+-#line 52655 "configure"
++#line 53972 "configure"
  #include "confdefs.h"
- 
- #include <c-client.h>
-@@ -48677,7 +50043,7 @@ int main() {
-       
- ; return 0; }
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -52659,7 +53976,7 @@ else
+ #include <float.h>
  EOF
--if { (eval echo configure:48681: \"$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
+ 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:53980: \"$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*
-   
-          ac_cv_u8t_decompose=yes
-@@ -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 50077 "configure"
- #include "confdefs.h"
- 
- #include "imap4r1.h"
-@@ -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: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 +50200,7 @@ else
-   ac_save_LIBS="$LIBS"
- LIBS="-lpam  $LIBS"
+@@ -52676,7 +53993,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 48838 "configure"
-+#line 50204 "configure"
+-#line 52680 "configure"
++#line 53997 "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 +50211,7 @@ int main() {
- pam_start()
- ; return 0; }
+ #include <string.h>
  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: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 +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: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 +50374,7 @@ else
-   ac_save_LIBS="$LIBS"
- LIBS="-lcrypt  $LIBS"
+@@ -52694,7 +54011,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 49012 "configure"
-+#line 50378 "configure"
+-#line 52698 "configure"
++#line 54015 "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 +50385,7 @@ int main() {
- crypt()
- ; return 0; }
+ #include <stdlib.h>
  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: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 +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: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
+@@ -52715,7 +54032,7 @@ if test "$cross_compiling" = yes; then
+   :
  else
-@@ -49592,7 +50958,7 @@ else
- 
-   else
-     cat > conftest.$ac_ext <<EOF
--#line 49596 "configure"
-+#line 50962 "configure"
+   cat > conftest.$ac_ext <<EOF
+-#line 52719 "configure"
++#line 54036 "configure"
  #include "confdefs.h"
- #include <$IMAP_INC_DIR/linkage.h>
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -52726,7 +54043,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
+ exit (0); }
+ 
  EOF
-@@ -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: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
+-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:54047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
  else
-@@ -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:51208: checking for OpenSSL version" >&5
-     cat > conftest.$ac_ext <<EOF
--#line 49844 "configure"
-+#line 51210 "configure"
- #include "confdefs.h"
+@@ -53076,7 +54393,7 @@ fi
+ php_with_ldap=no
  
- #include <openssl/opensslv.h>
-@@ -49995,7 +51361,7 @@ rm -f conftest*
-   done
+ echo $ac_n "checking for LDAP support""... $ac_c" 1>&6
+-echo "configure:53080: checking for LDAP support" >&5
++echo "configure:54397: 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 +54437,7 @@ echo "$ac_t""$ext_output" 1>&6
+ php_with_ldap_sasl=no
  
-   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: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 "checking for LDAP Cyrus SASL support""... $ac_c" 1>&6
+-echo "configure:53124: checking for LDAP Cyrus SASL support" >&5
++echo "configure:54441: 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 +56779,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:56783: 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
-@@ -50003,7 +51369,7 @@ else
-   ac_save_LIBS="$LIBS"
- LIBS="-lcrypto  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 50007 "configure"
-+#line 51373 "configure"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 55471 "configure"
++#line 56788 "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 +51380,7 @@ int main() {
- CRYPTO_free()
+ #include <ldap.h>
+ int main() {
+ ldap_set_rebind_proc(0,0,0)
  ; 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:51384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:55478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:56795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
+   ac_cv_3arg_setrebindproc=yes
  else
-@@ -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: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
+@@ -55497,12 +56814,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:56818: 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
-@@ -50179,7 +51545,7 @@ else
-   ac_save_LIBS="$LIBS"
- LIBS="-lssl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 50183 "configure"
-+#line 51549 "configure"
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 55506 "configure"
++#line 56823 "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 +51556,7 @@ int main() {
- SSL_CTX_set_ssl_version()
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -55525,7 +56842,7 @@ $ac_func();
+ 
  ; 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:51560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:55529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:56846: \"$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 +51675,7 @@ else
- 
-   elif test -f "$IMAP_INC_DIR/linkage.c"; then
-     cat > conftest.$ac_ext <<EOF
--#line 50313 "configure"
-+#line 51679 "configure"
- #include "confdefs.h"
- #include <$IMAP_INC_DIR/linkage.c>
- EOF
-@@ -50340,7 +51706,7 @@ rm -f conftest*
-   
+   eval "ac_cv_func_$ac_func=yes"
  else
-   cat > conftest.$ac_ext <<EOF
--#line 50344 "configure"
-+#line 51710 "configure"
- #include "confdefs.h"
+@@ -55537,62 +56854,514 @@ fi
+ rm -f conftest*
+ fi
  
-     
-@@ -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: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 +51775,7 @@ fi
-   
+-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_func 1
++EOF
++ 
++else
++  echo "$ac_t""no" 1>&6
++fi
++done
++
++  
++        if test "$PHP_LDAP_SASL" != "no"; then
++    
++  if test "$PHP_LDAP_SASL" = "yes"; then
++    SEARCH_DIRS="/usr/local /usr"
++  else
++    SEARCH_DIRS=$PHP_LDAP_SASL
++  fi
++
++  for i in $SEARCH_DIRS; do
++    if test -f $i/include/sasl/sasl.h; then
++      LDAP_SASL_DIR=$i
++      cat >> confdefs.h <<\EOF
++#define HAVE_LDAP_SASL_SASL_H 1
++EOF
++
++      break
++    elif test -f $i/include/sasl.h; then
++      LDAP_SASL_DIR=$i
++      cat >> confdefs.h <<\EOF
++#define HAVE_LDAP_SASL_H 1
++EOF
++
++      break
++    fi
++  done
++  
++  if test "$LDAP_SASL_DIR"; then
++    LDAP_SASL_INCDIR=$LDAP_SASL_DIR/include
++    LDAP_SASL_LIBDIR=$LDAP_SASL_DIR/$PHP_LIBDIR
++  else
++    { echo "configure: error: sasl.h not found!" 1>&2; exit 1; }
++  fi
++
++  if test "$PHP_LDAP_SASL" = "yes"; then
++    SASL_LIB="-lsasl2"
++  else
++    SASL_LIB="-L$LDAP_SASL_LIBDIR -lsasl2"
++  fi
++  
++  
++  save_old_LDFLAGS=$LDFLAGS
++  ac_stuff="
++    $LDAP_SHARED_LIBADD $SASL_LIB
++  "
++  
++  save_ext_shared=$ext_shared
++  ext_shared=yes
++  
++  for ac_i in $ac_stuff; do
++    case $ac_i in
++    -pthread)
++      if test "$ext_shared" = "yes"; then
++        LDFLAGS="$LDFLAGS -pthread"
++      else
++        
++  
++  unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'`
++  
++  cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\""
++  if test -n "$unique" && test "`eval $cmd`" = "" ; then
++    eval "EXTRA_LDFLAGS$unique=set"
++    EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i"
++  fi
++
++      fi
++    ;;
++    -l*)
++      ac_ii=`echo $ac_i|cut -c 3-`
++      
++  
++  case $ac_ii in
++  c|c_r|pthread*) ;;
++  *) 
++    if test "$ext_shared" = "yes"; then
++        LDFLAGS="$LDFLAGS -l$ac_ii" 
++    else
++      
++  
++  case $ac_ii in
++  c|c_r|pthread*) ;;
++  *) 
++      LIBS="$LIBS -l$ac_ii" 
++   ;;
++  esac
++
++
++    fi
++   ;;
++  esac
++
++
++    ;;
++    -L*)
++      ac_ii=`echo $ac_i|cut -c 3-`
++      
++  if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then
++    
++  if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then
++    ai_p=$ac_ii
++  else
++    
++    ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`"
++    
++    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
++    ai_p="$ep_realdir/`basename \"$ac_ii\"`"
++  fi
++
++    
++      if test "$ext_shared" = "yes"; then
++        LDFLAGS="-L$ai_p $LDFLAGS"
++        test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS"
++      else
++        
++  
++  
++  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
++  
++  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
++  if test -n "$unique" && test "`eval $cmd`" = "" ; then
++    eval "LIBPATH$unique=set"
++    
++    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
++    LDFLAGS="$LDFLAGS -L$ai_p"
++    PHP_RPATHS="$PHP_RPATHS $ai_p"
++  
++  fi
++
++
++      fi
++    
++  fi
++
++    ;;
++    esac
++  done
++
++  echo $ac_n "checking for sasl_version in -lldap""... $ac_c" 1>&6
++echo "configure:57008: 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
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-lldap  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 57016 "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
++    builtin and then its argument prototype would still apply.  */
++char sasl_version();
++
++int main() {
++sasl_version()
++; return 0; }
++EOF
++if { (eval echo configure:57027: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++  
++    LDFLAGS=$save_old_LDFLAGS
++    ext_shared=$save_ext_shared
++    
++    
++  if test "$LDAP_SASL_INCDIR" != "/usr/include"; then
++    
++  if test -z "$LDAP_SASL_INCDIR" || echo "$LDAP_SASL_INCDIR" | grep '^/' >/dev/null ; then
++    ai_p=$LDAP_SASL_INCDIR
++  else
++    
++    ep_dir="`echo $LDAP_SASL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
++    
++    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
++    ai_p="$ep_realdir/`basename \"$LDAP_SASL_INCDIR\"`"
++  fi
++
++    
++  
++  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
++  
++  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
++  if test -n "$unique" && test "`eval $cmd`" = "" ; then
++    eval "INCLUDEPATH$unique=set"
++    
++      if test ""; then
++        INCLUDES="-I$ai_p $INCLUDES"
++      else
++        INCLUDES="$INCLUDES -I$ai_p"
++      fi
++    
++  fi
++
++  fi
++
++    
++
++  if test "$ext_shared" = "yes"; then
++    LDAP_SHARED_LIBADD="-lsasl2 $LDAP_SHARED_LIBADD"
++    if test -n "$LDAP_SASL_LIBDIR"; then
++      
++  if test "$LDAP_SASL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_SASL_LIBDIR" != "/usr/lib"; then
++    
++  if test -z "$LDAP_SASL_LIBDIR" || echo "$LDAP_SASL_LIBDIR" | grep '^/' >/dev/null ; then
++    ai_p=$LDAP_SASL_LIBDIR
++  else
++    
++    ep_dir="`echo $LDAP_SASL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
++    
++    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
++    ai_p="$ep_realdir/`basename \"$LDAP_SASL_LIBDIR\"`"
++  fi
++
++    
++      if test "$ext_shared" = "yes"; then
++        LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD"
++        test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD"
++      else
++        
++  
++  
++  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
++  
++  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
++  if test -n "$unique" && test "`eval $cmd`" = "" ; then
++    eval "LIBPATH$unique=set"
++    
++    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
++    LDFLAGS="$LDFLAGS -L$ai_p"
++    PHP_RPATHS="$PHP_RPATHS $ai_p"
++  
++  fi
++
++
++      fi
++    
++  fi
++
++    fi
++  else
++    
++
++  if test -n "$LDAP_SASL_LIBDIR"; then
++    
++  if test "$LDAP_SASL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_SASL_LIBDIR" != "/usr/lib"; then
++    
++  if test -z "$LDAP_SASL_LIBDIR" || echo "$LDAP_SASL_LIBDIR" | grep '^/' >/dev/null ; then
++    ai_p=$LDAP_SASL_LIBDIR
++  else
++    
++    ep_dir="`echo $LDAP_SASL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
++    
++    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
++    ai_p="$ep_realdir/`basename \"$LDAP_SASL_LIBDIR\"`"
++  fi
++
++    
++      
++  
++  
++  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
++  
++  cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\""
++  if test -n "$unique" && test "`eval $cmd`" = "" ; then
++    eval "LIBPATH$unique=set"
++    
++    test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p"
++    LDFLAGS="$LDFLAGS -L$ai_p"
++    PHP_RPATHS="$PHP_RPATHS $ai_p"
++  
++  fi
++
++
++    
++  fi
++
++  fi
++  
++  
++  case sasl2 in
++  c|c_r|pthread*) ;;
++  *) 
++      LIBS="-lsasl2 $LIBS" 
++   ;;
++  esac
++
++
++
++
++  fi
++
++
++    cat >> confdefs.h <<\EOF
++#define HAVE_LDAP_SASL 1
++EOF
++
++  
++  
++else
++  echo "$ac_t""no" 1>&6
++
++    LDFLAGS=$save_old_LDFLAGS
++    ext_shared=$save_ext_shared
++    unset ac_cv_lib_ldap_sasl_version
++    
++    { echo "configure: error: LDAP SASL check failed. Please check config.log for more information." 1>&2; exit 1; }
++  
++  
++fi
++
++
++  fi
++
++        echo $ac_n "checking for ldap_bind_s""... $ac_c" 1>&6
++echo "configure:57196: 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 57201 "configure"
++#include "confdefs.h"
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char ldap_bind_s(); below.  */
++#include <assert.h>
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char ldap_bind_s();
++
++int main() {
++
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined (__stub_ldap_bind_s) || defined (__stub___ldap_bind_s)
++choke me
++#else
++ldap_bind_s();
++#endif
++
++; return 0; }
++EOF
++if { (eval echo configure:57224: \"$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
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_func_ldap_bind_s=no"
++fi
++rm -f conftest*
++fi
++
++if eval "test \"`echo '$ac_cv_func_'ldap_bind_s`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+-  cat >> confdefs.h <<EOF
+-#define $ac_tr_func 1
+-EOF
+- 
++  :
  else
-   cat > conftest.$ac_ext <<EOF
--#line 50413 "configure"
-+#line 51779 "configure"
- #include "confdefs.h"
+   echo "$ac_t""no" 1>&6
++
++    { echo "configure: error: LDAP build check failed. Please check config.log for more information." 1>&2; exit 1; } 
++  
+ fi
+-done
  
-     
-@@ -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: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 +51835,7 @@ fi
- 
+-        if test "$PHP_LDAP_SASL" != "no"; then
+-    
+-  if test "$PHP_LDAP_SASL" = "yes"; then
+-    SEARCH_DIRS="/usr/local /usr"
+-  else
+-    SEARCH_DIRS=$PHP_LDAP_SASL
+-  fi
++    CPPFLAGS=$_SAVE_CPPFLAGS
++  LIBS=$_SAVE_LIBS
++fi 
+ 
+-  for i in $SEARCH_DIRS; do
+-    if test -f $i/include/sasl/sasl.h; then
+-      LDAP_SASL_DIR=$i
+-      cat >> confdefs.h <<\EOF
+-#define HAVE_LDAP_SASL_SASL_H 1
+-EOF
  
-     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:51839: checking whether rfc822_output_address_list function present" >&5
-     
-   old_LIBS=$LIBS
-   LIBS="
-@@ -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 51851 "configure"
- #include "confdefs.h"
+-      break
+-    elif test -f $i/include/sasl.h; then
+-      LDAP_SASL_DIR=$i
+-      cat >> confdefs.h <<\EOF
+-#define HAVE_LDAP_SASL_H 1
+-EOF
  
-     
-@@ -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:51887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
+-      break
+-    fi
+-  done
++php_with_libevent=no
++
++echo $ac_n "checking for libevent support""... $ac_c" 1>&6
++echo "configure:57256: checking for libevent support" >&5
++# Check whether --with-libevent or --without-libevent was given.
++if test "${with_libevent+set}" = set; then
++  withval="$with_libevent"
++  PHP_LIBEVENT=$withval
++else
    
-     LIBS=$old_LIBS
-@@ -50546,7 +51912,7 @@ fi
- 
+-  if test "$LDAP_SASL_DIR"; then
+-    LDAP_SASL_INCDIR=$LDAP_SASL_DIR/include
+-    LDAP_SASL_LIBDIR=$LDAP_SASL_DIR/$PHP_LIBDIR
++  PHP_LIBEVENT=no
++  test "$PHP_ENABLE_ALL" && PHP_LIBEVENT=$PHP_ENABLE_ALL
++
++fi
++
++
++
++ext_output="yes, shared"
++ext_shared=yes
++case $PHP_LIBEVENT in
++shared,*)
++  PHP_LIBEVENT=`echo "$PHP_LIBEVENT"|$SED 's/^shared,//'`
++  ;;
++shared)
++  PHP_LIBEVENT=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_LIBEVENT" != "no"; then
++  SEARCH_PATH="/usr /usr/local"
++  SEARCH_FOR="/include/event.h"
++
++  if test "$PHP_LIBEVENT" = "yes"; then
++    echo $ac_n "checking for libevent headers in default path""... $ac_c" 1>&6
++echo "configure:57302: checking for libevent headers in default path" >&5
++    for i in $SEARCH_PATH ; do
++      if test -r $i/$SEARCH_FOR; then
++        LIBEVENT_DIR=$i
++        echo "$ac_t""found in $i" 1>&6
++      fi
++    done
+   else
+-    { echo "configure: error: sasl.h not found!" 1>&2; exit 1; }
++    echo $ac_n "checking for libevent headers in $PHP_LIBEVENT""... $ac_c" 1>&6
++echo "configure:57311: checking for libevent headers in $PHP_LIBEVENT" >&5
++    if test -r $PHP_LIBEVENT/$SEARCH_FOR; then
++      LIBEVENT_DIR=$PHP_LIBEVENT
++      echo "$ac_t""found" 1>&6
++    fi
+   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:51916: checking whether build with IMAP works" >&5
-     
-   
-   old_LIBS=$LIBS
-@@ -50557,7 +51923,7 @@ echo "configure:50550: checking whether build with IMAP works" >&5
+-  if test "$PHP_LDAP_SASL" = "yes"; then
+-    SASL_LIB="-lsasl2"
++  if test -z "$LIBEVENT_DIR"; then
++    echo "$ac_t""not found" 1>&6
++    { echo "configure: error: Cannot find libevent headers" 1>&2; exit 1; }
++  fi
++
++  
++  if test "$LIBEVENT_DIR/include" != "/usr/include"; then
++    
++  if test -z "$LIBEVENT_DIR/include" || echo "$LIBEVENT_DIR/include" | grep '^/' >/dev/null ; then
++    ai_p=$LIBEVENT_DIR/include
+   else
+-    SASL_LIB="-L$LDAP_SASL_LIBDIR -lsasl2"
++    
++    ep_dir="`echo $LIBEVENT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`"
++    
++    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
++    ai_p="$ep_realdir/`basename \"$LIBEVENT_DIR/include\"`"
+   fi
++
++    
++  
++  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
    
- else
-   cat > conftest.$ac_ext <<EOF
--#line 50561 "configure"
-+#line 51927 "configure"
- #include "confdefs.h"
- 
-     
-@@ -50590,7 +51956,7 @@ else
-     }
++  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
++  if test -n "$unique" && test "`eval $cmd`" = "" ; then
++    eval "INCLUDEPATH$unique=set"
++    
++      if test ""; then
++        INCLUDES="-I$ai_p $INCLUDES"
++      else
++        INCLUDES="$INCLUDES -I$ai_p"
++      fi
++    
++  fi
++
++  fi
++
++
++  LIBNAME=event
++  LIBSYMBOL=event_base_new
++
++  if test "x$PHP_LIBDIR" = "x"; then
++    PHP_LIBDIR=lib
++  fi
++
    
- 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:51960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
+   save_old_LDFLAGS=$LDFLAGS
+   ac_stuff="
+-    $LDAP_SHARED_LIBADD $SASL_LIB
++    -L$LIBEVENT_DIR/$PHP_LIBDIR 
+   "
    
-     LIBS=$old_LIBS
-@@ -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: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 +52135,7 @@ if test "$PHP_INTERBASE" != "no"; then
+   save_ext_shared=$ext_shared
+@@ -55686,27 +57455,27 @@ EOF
+     esac
    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:52139: checking for isc_detach_database in -lfbclient" >&5
- ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'`
+-  echo $ac_n "checking for sasl_version in -lldap""... $ac_c" 1>&6
+-echo "configure:55691: checking for sasl_version in -lldap" >&5
+-ac_lib_var=`echo ldap'_'sasl_version | sed 'y%./+-%__p_%'`
++  echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6
++echo "configure:57460: 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
-@@ -50777,7 +52143,7 @@ else
-   ac_save_LIBS="$LIBS"
- LIBS="-lfbclient  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 50781 "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 +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: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 +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: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 +52289,7 @@ else
    ac_save_LIBS="$LIBS"
- LIBS="-lgds  $LIBS"
+-LIBS="-lldap  $LIBS"
++LIBS="-l$LIBNAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
--#line 50927 "configure"
-+#line 52293 "configure"
+-#line 55699 "configure"
++#line 57468 "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 +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: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 +52427,7 @@ else
-   done
+     builtin and then its argument prototype would still apply.  */
+-char sasl_version();
++char $LIBSYMBOL();
  
-   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: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 +52435,7 @@ else
-   ac_save_LIBS="$LIBS"
- LIBS="-lib_util  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 51073 "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 +52446,7 @@ int main() {
- isc_detach_database()
+ int main() {
+-sasl_version()
++$LIBSYMBOL()
  ; 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:52450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:55710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:57479: \"$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 +52923,7 @@ fi
- php_enable_intl=no
+@@ -55726,58 +57495,27 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
+     ext_shared=$save_ext_shared
+     
+     
+-  if test "$LDAP_SASL_INCDIR" != "/usr/include"; then
+-    
+-  if test -z "$LDAP_SASL_INCDIR" || echo "$LDAP_SASL_INCDIR" | grep '^/' >/dev/null ; then
+-    ai_p=$LDAP_SASL_INCDIR
+-  else
+-    
+-    ep_dir="`echo $LDAP_SASL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+-    
+-    ep_realdir="`(cd \"$ep_dir\" && pwd)`"
+-    ai_p="$ep_realdir/`basename \"$LDAP_SASL_INCDIR\"`"
+-  fi
+-
+-    
+-  
+-  unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'`
+-  
+-  cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\""
+-  if test -n "$unique" && test "`eval $cmd`" = "" ; then
+-    eval "INCLUDEPATH$unique=set"
+-    
+-      if test ""; then
+-        INCLUDES="-I$ai_p $INCLUDES"
+-      else
+-        INCLUDES="$INCLUDES -I$ai_p"
+-      fi
+-    
+-  fi
+-
+-  fi
+-
+-    
  
- 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: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 +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: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 +53033,7 @@ fi
+   if test "$ext_shared" = "yes"; then
+-    LDAP_SHARED_LIBADD="-lsasl2 $LDAP_SHARED_LIBADD"
+-    if test -n "$LDAP_SASL_LIBDIR"; then
++    LIBEVENT_SHARED_LIBADD="-l$LIBNAME $LIBEVENT_SHARED_LIBADD"
++    if test -n "$LIBEVENT_DIR/$PHP_LIBDIR"; then
+       
+-  if test "$LDAP_SASL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_SASL_LIBDIR" != "/usr/lib"; then
++  if test "$LIBEVENT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEVENT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
+     
+-  if test -z "$LDAP_SASL_LIBDIR" || echo "$LDAP_SASL_LIBDIR" | grep '^/' >/dev/null ; then
+-    ai_p=$LDAP_SASL_LIBDIR
++  if test -z "$LIBEVENT_DIR/$PHP_LIBDIR" || echo "$LIBEVENT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
++    ai_p=$LIBEVENT_DIR/$PHP_LIBDIR
+   else
+     
+-    ep_dir="`echo $LDAP_SASL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
++    ep_dir="`echo $LIBEVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+     
+     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
+-    ai_p="$ep_realdir/`basename \"$LDAP_SASL_LIBDIR\"`"
++    ai_p="$ep_realdir/`basename \"$LIBEVENT_DIR/$PHP_LIBDIR\"`"
    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: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 +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:53047: checking for ICU 3.4 or greater" >&5
-     icu_version_full=`$ICU_CONFIG --version`
-     ac_IFS=$IFS
-     IFS="."
-@@ -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: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 +53232,7 @@ test -n "$CXX" || CXX="gcc"
+     
+       if test "$ext_shared" = "yes"; then
+-        LDAP_SHARED_LIBADD="-L$ai_p $LDAP_SHARED_LIBADD"
+-        test -n "$ld_runpath_switch" && LDAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $LDAP_SHARED_LIBADD"
++        LIBEVENT_SHARED_LIBADD="-L$ai_p $LIBEVENT_SHARED_LIBADD"
++        test -n "$ld_runpath_switch" && LIBEVENT_SHARED_LIBADD="$ld_runpath_switch$ai_p $LIBEVENT_SHARED_LIBADD"
+       else
+         
+   
+@@ -55803,18 +57541,18 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
+   else
+     
  
+-  if test -n "$LDAP_SASL_LIBDIR"; then
++  if test -n "$LIBEVENT_DIR/$PHP_LIBDIR"; then
+     
+-  if test "$LDAP_SASL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LDAP_SASL_LIBDIR" != "/usr/lib"; then
++  if test "$LIBEVENT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEVENT_DIR/$PHP_LIBDIR" != "/usr/lib"; then
+     
+-  if test -z "$LDAP_SASL_LIBDIR" || echo "$LDAP_SASL_LIBDIR" | grep '^/' >/dev/null ; then
+-    ai_p=$LDAP_SASL_LIBDIR
++  if test -z "$LIBEVENT_DIR/$PHP_LIBDIR" || echo "$LIBEVENT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then
++    ai_p=$LIBEVENT_DIR/$PHP_LIBDIR
+   else
+     
+-    ep_dir="`echo $LDAP_SASL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
++    ep_dir="`echo $LIBEVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`"
+     
+     ep_realdir="`(cd \"$ep_dir\" && pwd)`"
+-    ai_p="$ep_realdir/`basename \"$LDAP_SASL_LIBDIR\"`"
++    ai_p="$ep_realdir/`basename \"$LIBEVENT_DIR/$PHP_LIBDIR\"`"
+   fi
  
- 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:53236: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+     
+@@ -55840,10 +57578,10 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
+   fi
+   
+   
+-  case sasl2 in
++  case $LIBNAME in
+   c|c_r|pthread*) ;;
+   *) 
+-      LIBS="-lsasl2 $LIBS" 
++      LIBS="-l$LIBNAME $LIBS" 
+    ;;
+   esac
  
- ac_ext=C
- # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -51877,12 +53243,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
+@@ -55853,10 +57591,6 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
+   fi
  
- cat > conftest.$ac_ext << EOF
  
--#line 51881 "configure"
-+#line 53247 "configure"
- #include "confdefs.h"
+-    cat >> confdefs.h <<\EOF
+-#define HAVE_LDAP_SASL 1
+-EOF
+-
+   
+   
+ else
+@@ -55864,71 +57598,329 @@ else
  
- 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: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 +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; }
+     LDFLAGS=$save_old_LDFLAGS
+     ext_shared=$save_ext_shared
+-    unset ac_cv_lib_ldap_sasl_version
++    unset ac_cv_lib_$LIBNAME_$LIBSYMBOL
+     
+-    { echo "configure: error: LDAP SASL check failed. Please check config.log for more information." 1>&2; exit 1; }
++    { echo "configure: error: wrong libevent version {1.4.+ is required} or lib not found" 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: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: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 +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: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 +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: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 +53338,8 @@ else
+ 
++  
++  am_i_shared=$PHP_LIBEVENT_SHARED
++  is_it_shared=$PHP_SOCKETS_SHARED
++  is_it_enabled=$PHP_SOCKETS
++  if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then
++    { echo "configure: error: 
++You've configured extension libevent to build statically, but it
++depends on extension sockets, which you've configured to build shared.
++You either need to build libevent shared or build sockets statically for the
++build to be successful.
++" 1>&2; exit 1; }
++  fi
++  if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then
++    { echo "configure: error: 
++You've configured extension libevent, which depends on extension sockets,
++but you've either not enabled sockets, or have disabled it.
++" 1>&2; exit 1; }
    fi
- fi
++  
++  
++  PHP_VAR_SUBST="$PHP_VAR_SUBST LIBEVENT_SHARED_LIBADD"
  
--for ac_declaration in \
--   ''\
--   '#include <stdlib.h>' \
--   'extern "C" void std::exit (int) throw (); using std::exit;' \
--   'extern "C" void std::exit (int); using std::exit;' \
--   'extern "C" void exit (int) throw ();' \
--   'extern "C" void exit (int);' \
--   'void exit (int);'
--do
--  cat > conftest.$ac_ext <<EOF
--#line 51986 "configure"
--#include "confdefs.h"
--#include <stdlib.h>
--$ac_declaration
--int main() {
--exit (42);
--; return 0; }
--EOF
--if { (eval echo configure:51994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--  :
+-        echo $ac_n "checking for ldap_bind_s""... $ac_c" 1>&6
+-echo "configure:55879: 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
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  continue
--fi
--rm -f conftest*
 -  cat > conftest.$ac_ext <<EOF
--#line 52004 "configure"
+-#line 55884 "configure"
 -#include "confdefs.h"
--$ac_declaration
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char ldap_bind_s(); below.  */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char ldap_bind_s();
++  
++  ext_builddir=ext/libevent
++  ext_srcdir=$abs_srcdir/ext/libevent
+ 
 -int main() {
--exit (42);
++  ac_extra=
+ 
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_ldap_bind_s) || defined (__stub___ldap_bind_s)
+-choke me
+-#else
+-ldap_bind_s();
+-#endif
++  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then
++    PHP_LIBEVENT_SHARED=no
++    
++  
++  case ext/libevent in
++  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
++  /*) ac_srcdir=`echo "ext/libevent"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
++  *) ac_srcdir="$abs_srcdir/ext/libevent/"; ac_bdir="ext/libevent/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
++  esac
++  
++  
+ 
 -; return 0; }
--EOF
--if { (eval echo configure:52011: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  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 libevent.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
+-if { (eval echo configure:55907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 -  rm -rf conftest*
--  break
+-  eval "ac_cv_func_ldap_bind_s=yes"
 -else
 -  echo "configure: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_func_ldap_bind_s=no"
 -fi
 -rm -f conftest*
--done
--if test -n "$ac_declaration"; then
--  echo '#ifdef __cplusplus' >>confdefs.h
--  echo $ac_declaration      >>confdefs.h
--  echo '#endif'             >>confdefs.h
 -fi
--
--
-     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: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 +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 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: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 +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: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 +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: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 53970 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -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: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 +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 53995 "configure"
- #include "confdefs.h"
- #include <string.h>
- EOF
-@@ -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 54013 "configure"
- #include "confdefs.h"
- #include <stdlib.h>
- EOF
-@@ -52715,7 +54030,7 @@ if test "$cross_compiling" = yes; then
-   :
- else
-   cat > conftest.$ac_ext <<EOF
--#line 52719 "configure"
-+#line 54034 "configure"
- #include "confdefs.h"
- #include <ctype.h>
- #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -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:54045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
- then
-   :
- else
-@@ -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: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 +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: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 +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: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 56786 "configure"
- #include "confdefs.h"
- #include <ldap.h>
- int main() {
- ldap_set_rebind_proc(0,0,0)
- ; return 0; }
- EOF
--if { (eval echo configure:55478: \"$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 +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: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 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 +56840,7 @@ $ac_func();
++  done
  
- ; 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: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 +57002,7 @@ EOF
-   done
+-if eval "test \"`echo '$ac_cv_func_'ldap_bind_s`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  :
+-else
+-  echo "$ac_t""no" 1>&6
  
-   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: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 +57010,7 @@ else
-   ac_save_LIBS="$LIBS"
- LIBS="-lldap  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 55699 "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 +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: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 +57190,12 @@ fi
-   fi
+-    { echo "configure: error: LDAP build check failed. Please check config.log for more information." 1>&2; exit 1; } 
++    EXT_STATIC="$EXT_STATIC libevent"
++    if test "$ext_shared" != "nocli"; then
++      EXT_CLI_STATIC="$EXT_CLI_STATIC libevent"
++    fi
++  else
++    if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then
++      PHP_LIBEVENT_SHARED=yes
++      
++  case ext/libevent in
++  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
++  /*) ac_srcdir=`echo "ext/libevent"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
++  *) ac_srcdir="$abs_srcdir/ext/libevent/"; ac_bdir="ext/libevent/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;;
++  esac
+   
+-fi
++  
++
++  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
++
  
-         echo $ac_n "checking for ldap_bind_s""... $ac_c" 1>&6
--echo "configure:55879: 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 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 +57218,7 @@ ldap_bind_s();
++  old_IFS=$IFS
++  for ac_src in libevent.c; do
+   
+-    CPPFLAGS=$_SAVE_CPPFLAGS
+-  LIBS=$_SAVE_LIBS
+-fi 
++      IFS=.
++      set $ac_src
++      ac_obj=$1
++      IFS=$old_IFS
++      
++      shared_objects_libevent="$shared_objects_libevent $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'/phplibevent.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_libevent) $(PHPLIBEVENT_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phplibevent.so '$ext_builddir'/phplibevent.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_libevent) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPLIBEVENT, 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_libevent) $(PHPLIBEVENT_SHARED_LIBADD)'
++      ;;
++  esac
++
++  if test "x" = "xyes"; then
++    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phplibevent.$suffix"
++  else
++    PHP_MODULES="$PHP_MODULES \$(phplibdir)/phplibevent.$suffix"
++  fi
++  
++  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_libevent"
++
++  cat >>Makefile.objects<<EOF
++\$(phplibdir)/phplibevent.$suffix: $ext_builddir/phplibevent.$suffix
++      \$(LIBTOOL) --mode=install cp $ext_builddir/phplibevent.$suffix \$(phplibdir)
++
++$ext_builddir/phplibevent.$suffix: \$(shared_objects_libevent) \$(PHPLIBEVENT_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'/libevent.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_libevent) $(LIBEVENT_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/libevent.so '$ext_builddir'/libevent.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_libevent) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(LIBEVENT, 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_libevent) $(LIBEVENT_SHARED_LIBADD)'
++      ;;
++  esac
++
++  if test "x" = "xyes"; then
++    PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/libevent.$suffix"
++  else
++    PHP_MODULES="$PHP_MODULES \$(phplibdir)/libevent.$suffix"
++  fi
++  
++  PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_libevent"
++
++  cat >>Makefile.objects<<EOF
++\$(phplibdir)/libevent.$suffix: $ext_builddir/libevent.$suffix
++      \$(LIBTOOL) --mode=install cp $ext_builddir/libevent.$suffix \$(phplibdir)
++
++$ext_builddir/libevent.$suffix: \$(shared_objects_libevent) \$(LIBEVENT_SHARED_DEPENDENCIES)
++      $link_cmd
++
++EOF
++
++          ;;
++      esac
++      cat >> confdefs.h <<EOF
++#define COMPILE_DL_LIBEVENT 1
++EOF
++
++    fi
++  fi
++
++  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then
++    PHP_LIBEVENT_SHARED=no
++    case "$PHP_SAPI" in
++      cgi|embed)
++        
++  
++  case ext/libevent in
++  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
++  /*) ac_srcdir=`echo "ext/libevent"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
++  *) ac_srcdir="$abs_srcdir/ext/libevent/"; ac_bdir="ext/libevent/"; 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 libevent.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 libevent"
++        ;;
++      *)
++        
++  
++  case ext/libevent in
++  "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;;
++  /*) ac_srcdir=`echo "ext/libevent"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;;
++  *) ac_srcdir="$abs_srcdir/ext/libevent/"; ac_bdir="ext/libevent/"; 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 libevent.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 libevent"
++  fi
++  
++  
++    BUILD_DIR="$BUILD_DIR $ext_builddir"
++  
++
++
++  if test "$ext_builddir" = "."; then
++    PHP_PECL_EXTENSION=libevent
++    
++  PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION"
++
++  fi
++
++fi
  
- ; 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: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 +57271,7 @@ fi
+ 
+ 
+@@ -55956,7 +57948,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:57275: checking whether to enable multibyte string support" >&5
++echo "configure:57952: 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 +57315,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -56000,7 +57992,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:57319: checking whether to enable multibyte regex support" >&5
++echo "configure:57996: 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 +57338,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -56023,7 +58015,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:57342: checking whether to check multibyte regex backtrack" >&5
++echo "configure:58019: 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 +57361,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -56046,7 +58038,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:57365: checking for external libmbfl" >&5
++echo "configure:58042: 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 +57384,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -56069,7 +58061,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:57388: checking for external oniguruma" >&5
++echo "configure:58065: 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 +57425,7 @@ EOF
+@@ -56110,7 +58102,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:57429: checking for variable length prototypes and stdarg.h" >&5
++echo "configure:58106: 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 +57443,7 @@ else
+@@ -56128,7 +58120,7 @@ else
          
  else
    cat > conftest.$ac_ext <<EOF
 -#line 56132 "configure"
-+#line 57447 "configure"
++#line 58124 "configure"
  #include "confdefs.h"
  
  #include <stdarg.h>
-@@ -56143,7 +57458,7 @@ int foo(int x, ...) {
+@@ -56143,7 +58135,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:57462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:58139: \"$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 +57479,17 @@ echo "$ac_t""$php_cv_mbstring_stdarg" 1>&6
+@@ -56164,17 +58156,17 @@ echo "$ac_t""$php_cv_mbstring_stdarg" 1>
  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:57483: checking for $ac_hdr" >&5
++echo "configure:58160: 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 57488 "configure"
++#line 58165 "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:57493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:58170: \"$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 +57516,7 @@ fi
+@@ -56201,7 +58193,7 @@ fi
  done
  
        echo $ac_n "checking size of int""... $ac_c" 1>&6
 -echo "configure:56205: checking size of int" >&5
-+echo "configure:57520: checking size of int" >&5
++echo "configure:58197: 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 +57524,19 @@ else
+@@ -56209,18 +58201,19 @@ else
    ac_cv_sizeof_int=4
  else
    cat > conftest.$ac_ext <<EOF
 -#line 56213 "configure"
-+#line 57528 "configure"
++#line 58205 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -10048,25 +12049,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:57540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:58217: \"$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 +57556,7 @@ EOF
+@@ -56240,7 +58233,7 @@ EOF
  
  
        echo $ac_n "checking size of short""... $ac_c" 1>&6
 -echo "configure:56244: checking size of short" >&5
-+echo "configure:57560: checking size of short" >&5
++echo "configure:58237: 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 +57564,19 @@ else
+@@ -56248,18 +58241,19 @@ else
    ac_cv_sizeof_short=2
  else
    cat > conftest.$ac_ext <<EOF
 -#line 56252 "configure"
-+#line 57568 "configure"
++#line 58245 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -10082,25 +12083,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:57580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:58257: \"$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 +57596,7 @@ EOF
+@@ -56279,7 +58273,7 @@ EOF
  
  
        echo $ac_n "checking size of long""... $ac_c" 1>&6
 -echo "configure:56283: checking size of long" >&5
-+echo "configure:57600: checking size of long" >&5
++echo "configure:58277: 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 +57604,19 @@ else
+@@ -56287,18 +58281,19 @@ else
    ac_cv_sizeof_long=4
  else
    cat > conftest.$ac_ext <<EOF
 -#line 56291 "configure"
-+#line 57608 "configure"
++#line 58285 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -10116,70 +12117,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:57620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:58297: \"$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 +57636,12 @@ EOF
+@@ -56318,12 +58313,12 @@ EOF
  
  
        echo $ac_n "checking for working const""... $ac_c" 1>&6
 -echo "configure:56322: checking for working const" >&5
-+echo "configure:57640: checking for working const" >&5
++echo "configure:58317: 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 57645 "configure"
++#line 58322 "configure"
  #include "confdefs.h"
  
  int main() {
-@@ -56372,7 +57690,7 @@ ccp = (char const *const *) p;
+@@ -56372,7 +58367,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:57694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:58371: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_const=yes
  else
-@@ -56393,12 +57711,12 @@ EOF
+@@ -56393,12 +58388,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:57715: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:58392: 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 57720 "configure"
++#line 58397 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/time.h>
-@@ -56407,7 +57725,7 @@ int main() {
+@@ -56407,7 +58402,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:57729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:58406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_header_time=yes
  else
-@@ -56430,19 +57748,19 @@ fi
+@@ -56430,19 +58425,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:57752: checking for working alloca.h" >&5
++echo "configure:58429: 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 57757 "configure"
++#line 58434 "configure"
  #include "confdefs.h"
  #include <alloca.h>
  int main() {
@@ -10187,583 +12188,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:57764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:58441: \"$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 +57781,12 @@ EOF
+@@ -56463,12 +58458,12 @@ EOF
  fi
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
 -echo "configure:56467: checking for alloca" >&5
-+echo "configure:57785: checking for alloca" >&5
++echo "configure:58462: 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 57790 "configure"
++#line 58467 "configure"
  #include "confdefs.h"
  
  #ifdef __GNUC__
-@@ -56496,7 +57814,7 @@ int main() {
+@@ -56496,7 +58491,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:57818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:58495: \"$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 +57846,12 @@ EOF
+@@ -56528,12 +58523,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:57850: checking whether alloca needs Cray hooks" >&5
++echo "configure:58527: 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 57855 "configure"
++#line 58532 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
  webecray
-@@ -56558,12 +57876,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
+@@ -56558,12 +58553,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:57880: checking for $ac_func" >&5
++echo "configure:58557: 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 57885 "configure"
++#line 58562 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -56586,7 +57904,7 @@ $ac_func();
+@@ -56586,7 +58581,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:57908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:58585: \"$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 +57931,7 @@ done
+@@ -56613,7 +58608,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:57935: checking stack direction for C alloca" >&5
++echo "configure:58612: 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 +57939,7 @@ else
+@@ -56621,7 +58616,7 @@ else
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
 -#line 56625 "configure"
-+#line 57943 "configure"
++#line 58620 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
-@@ -56640,7 +57958,7 @@ main ()
+@@ -56640,7 +58635,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:57962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:58639: \"$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 +57980,7 @@ EOF
+@@ -56662,7 +58657,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:57984: checking for 8-bit clean memcmp" >&5
++echo "configure:58661: 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 +57988,7 @@ else
+@@ -56670,7 +58665,7 @@ else
    ac_cv_func_memcmp_clean=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 56674 "configure"
-+#line 57992 "configure"
++#line 58669 "configure"
  #include "confdefs.h"
  
  main()
-@@ -56680,7 +57998,7 @@ main()
+@@ -56680,7 +58675,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:58002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:58679: \"$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 +58017,17 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
+@@ -56699,17 +58694,17 @@ test $ac_cv_func_memcmp_clean = no && LI
  
        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:58021: checking for stdarg.h" >&5
++echo "configure:58698: 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 58026 "configure"
++#line 58703 "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:58031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:58708: \"$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 +58257,7 @@ EOF
+@@ -56939,7 +58934,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:58261: checking for onig_init in -lonig" >&5
++echo "configure:58938: 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 +58265,7 @@ else
+@@ -56947,7 +58942,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lonig  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 56951 "configure"
-+#line 58269 "configure"
++#line 58946 "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 +58276,7 @@ int main() {
+@@ -56958,7 +58953,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:58280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:58957: \"$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 +58502,9 @@ fi
+@@ -57184,9 +59179,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:58506: checking if oniguruma has an invalid entry for KOI8 encoding" >&5
++echo "configure:59183: checking if oniguruma has an invalid entry for KOI8 encoding" >&5
        cat > conftest.$ac_ext <<EOF
 -#line 57190 "configure"
-+#line 58508 "configure"
++#line 59185 "configure"
  #include "confdefs.h"
  
  #include <oniguruma.h>
-@@ -57197,7 +58515,7 @@ return (int)(ONIG_ENCODING_KOI8 + 1);
+@@ -57197,7 +59192,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:58519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:59196: \"$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 +58813,7 @@ EOF
+@@ -57495,7 +59490,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:58817: checking for mbfl_buffer_converter_new in -lmbfl" >&5
++echo "configure:59494: 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 +58821,7 @@ else
+@@ -57503,7 +59498,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lmbfl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 57507 "configure"
-+#line 58825 "configure"
++#line 59502 "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 +58832,7 @@ int main() {
+@@ -57514,7 +59509,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:58836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:59513: \"$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 +59469,7 @@ fi
+@@ -58151,7 +60146,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:59473: checking for mcrypt support" >&5
++echo "configure:60150: 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 +59522,9 @@ if test "$PHP_MCRYPT" != "no"; then
+@@ -58204,9 +60199,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:59526: checking for libmcrypt version" >&5
++echo "configure:60203: checking for libmcrypt version" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 58210 "configure"
-+#line 59528 "configure"
++#line 60205 "configure"
  #include "confdefs.h"
  
  #include <mcrypt.h>
-@@ -58330,7 +59648,7 @@ rm -f conftest*
+@@ -58330,7 +60325,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:59652: checking for mcrypt_module_open in -lmcrypt" >&5
++echo "configure:60329: 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 +59656,7 @@ else
+@@ -58338,7 +60333,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lmcrypt  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 58342 "configure"
-+#line 59660 "configure"
++#line 60337 "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 +59667,7 @@ int main() {
+@@ -58349,7 +60344,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:59671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:60348: \"$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 +59820,7 @@ else
+@@ -58502,7 +60497,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:59824: checking for mcrypt_module_open in -lmcrypt" >&5
++echo "configure:60501: 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 +59828,7 @@ else
+@@ -58510,7 +60505,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lmcrypt  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 58514 "configure"
-+#line 59832 "configure"
++#line 60509 "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 +59839,7 @@ int main() {
+@@ -58521,7 +60516,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:59843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:60520: \"$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 +60312,7 @@ fi
+@@ -58994,7 +60989,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:60316: checking for MSSQL support via FreeTDS" >&5
++echo "configure:60993: 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 +60810,7 @@ EOF
+@@ -59492,7 +61487,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:60814: checking for dnet_addr in -ldnet_stub" >&5
++echo "configure:61491: 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 +60818,7 @@ else
+@@ -59500,7 +61495,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ldnet_stub  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 59504 "configure"
-+#line 60822 "configure"
++#line 61499 "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 +60829,7 @@ int main() {
+@@ -59511,7 +61506,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:60833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:61510: \"$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 +60973,7 @@ fi
+@@ -59655,7 +61650,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:60977: checking for MySQL support" >&5
++echo "configure:61654: 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 +61017,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -59699,7 +61694,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:61021: checking for specified location of the MySQL UNIX socket" >&5
++echo "configure:61698: 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 +61041,7 @@ if test -z "$PHP_ZLIB_DIR"; then
+@@ -59723,7 +61718,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:61045: checking for the location of libz" >&5
++echo "configure:61722: 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 +61215,7 @@ Note that the MySQL client library is not bundled anymore!" 1>&2; exit 1; }
+@@ -59897,7 +61892,7 @@ Note that the MySQL client library is no
    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:61219: checking for mysql_close in -l$MYSQL_LIBNAME" >&5
++echo "configure:61896: 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 +61223,7 @@ else
+@@ -59905,7 +61900,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$MYSQL_LIBNAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 59909 "configure"
-+#line 61227 "configure"
++#line 61904 "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 +61234,7 @@ int main() {
+@@ -59916,7 +61911,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:61238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:61915: \"$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 +61457,7 @@ else
+@@ -60139,7 +62134,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:61461: checking for mysql_error in -l$MYSQL_LIBNAME" >&5
++echo "configure:62138: 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 +61465,7 @@ else
+@@ -60147,7 +62142,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$MYSQL_LIBNAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 60151 "configure"
-+#line 61469 "configure"
++#line 62146 "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 +61476,7 @@ int main() {
+@@ -60158,7 +62153,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:61480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:62157: \"$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 +61631,7 @@ fi
+@@ -60313,7 +62308,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:61635: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5
++echo "configure:62312: 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 +61639,7 @@ else
+@@ -60321,7 +62316,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$MYSQL_LIBNAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 60325 "configure"
-+#line 61643 "configure"
++#line 62320 "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 +61650,7 @@ int main() {
+@@ -60332,7 +62327,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:61654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:62331: \"$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 +61844,7 @@ fi
+@@ -60526,7 +62521,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:61848: checking for MySQL UNIX socket location" >&5
++echo "configure:62525: 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 +62217,7 @@ fi
+@@ -60899,7 +62894,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:62221: checking for MySQLi support" >&5
++echo "configure:62898: 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 +62261,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -60943,7 +62938,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:62265: checking whether to enable embedded MySQLi support" >&5
++echo "configure:62942: 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 +62412,7 @@ EOF
+@@ -61094,7 +63089,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:62416: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5
++echo "configure:63093: 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 +62420,7 @@ else
+@@ -61102,7 +63097,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$MYSQL_LIB_NAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 61106 "configure"
-+#line 62424 "configure"
++#line 63101 "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 +62431,7 @@ int main() {
+@@ -61113,7 +63108,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:62435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:63112: \"$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 +62679,7 @@ EOF
+@@ -61361,7 +63356,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:62683: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5
++echo "configure:63360: 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 +62687,7 @@ else
+@@ -61369,7 +63364,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$MYSQL_LIB_NAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 61373 "configure"
-+#line 62691 "configure"
++#line 63368 "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 +62698,7 @@ int main() {
+@@ -61380,7 +63375,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:62702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:63379: \"$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 +62842,7 @@ fi
+@@ -61524,7 +63519,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:62846: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5
++echo "configure:63523: 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 +62850,7 @@ else
+@@ -61532,7 +63527,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$MYSQL_LIB_NAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 61536 "configure"
-+#line 62854 "configure"
++#line 63531 "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 +62861,7 @@ int main() {
+@@ -61543,7 +63538,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:62865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:63542: \"$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 +63265,7 @@ fi
+@@ -61947,7 +63942,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:63269: checking for Oracle (OCI8) support" >&5
++echo "configure:63946: 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 +63313,7 @@ if test "$PHP_OCI8" != "no"; then
+@@ -61995,7 +63990,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:63317: checking PHP version" >&5
++echo "configure:63994: checking PHP version" >&5
  
    tmp_version=$PHP_VERSION
    if test -z "$tmp_version"; then
-@@ -62027,7 +63345,7 @@ echo "configure:61999: checking PHP version" >&5
+@@ -62027,7 +64022,7 @@ echo "configure:61999: checking PHP vers
  
    
    echo $ac_n "checking size of long int""... $ac_c" 1>&6
 -echo "configure:62031: checking size of long int" >&5
-+echo "configure:63349: checking size of long int" >&5
++echo "configure:64026: 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 +63353,19 @@ else
+@@ -62035,18 +64030,19 @@ else
    ac_cv_sizeof_long_int=4
  else
    cat > conftest.$ac_ext <<EOF
 -#line 62039 "configure"
-+#line 63357 "configure"
++#line 64034 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -10779,558 +12780,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:63369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:64046: \"$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 +63385,7 @@ EOF
+@@ -62066,7 +64062,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:63389: checking checking if we're on a 64-bit platform" >&5
++echo "configure:64066: 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 +63429,7 @@ echo "configure:62070: checking checking if we're on a 64-bit platform" >&5
+@@ -62110,7 +64106,7 @@ echo "configure:62070: checking checking
    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:63433: checking Oracle ORACLE_HOME install directory" >&5
++echo "configure:64110: checking Oracle ORACLE_HOME install directory" >&5
  
      if test "$PHP_OCI8" = "yes"; then
        OCI8_DIR=$ORACLE_HOME
-@@ -62121,7 +63440,7 @@ echo "configure:62114: checking Oracle ORACLE_HOME install directory" >&5
+@@ -62121,7 +64117,7 @@ echo "configure:62114: checking Oracle O
  
      
    echo $ac_n "checking ORACLE_HOME library validity""... $ac_c" 1>&6
 -echo "configure:62125: checking ORACLE_HOME library validity" >&5
-+echo "configure:63444: checking ORACLE_HOME library validity" >&5
++echo "configure:64121: 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 +63781,7 @@ echo "configure:62125: checking ORACLE_HOME library validity" >&5
+@@ -62462,7 +64458,7 @@ echo "configure:62125: checking ORACLE_H
  
      
    echo $ac_n "checking Oracle version""... $ac_c" 1>&6
 -echo "configure:62466: checking Oracle version" >&5
-+echo "configure:63785: checking Oracle version" >&5
++echo "configure:64462: 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 +63911,7 @@ echo "configure:62466: checking Oracle version" >&5
+@@ -62592,7 +64588,7 @@ echo "configure:62466: checking Oracle v
    done
  
    echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6
 -echo "configure:62596: checking for OCIEnvNlsCreate in -lclntsh" >&5
-+echo "configure:63915: checking for OCIEnvNlsCreate in -lclntsh" >&5
++echo "configure:64592: 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 +63919,7 @@ else
+@@ -62600,7 +64596,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lclntsh  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 62604 "configure"
-+#line 63923 "configure"
++#line 64600 "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 +63930,7 @@ int main() {
+@@ -62611,7 +64607,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:63934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:64611: \"$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 +64367,7 @@ EOF
+@@ -63048,7 +65044,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:64371: checking Oracle Instant Client directory" >&5
++echo "configure:65048: 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 +64380,7 @@ echo "configure:63052: checking Oracle Instant Client directory" >&5
+@@ -63061,7 +65057,7 @@ echo "configure:63052: checking Oracle I
      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:64384: checking Oracle Instant Client SDK header directory" >&5
++echo "configure:65061: 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 +64589,7 @@ echo "configure:63065: checking Oracle Instant Client SDK header directory" >&5
+@@ -63270,7 +65266,7 @@ echo "configure:63065: checking Oracle I
  
      
    echo $ac_n "checking Oracle Instant Client version""... $ac_c" 1>&6
 -echo "configure:63274: checking Oracle Instant Client version" >&5
-+echo "configure:64593: checking Oracle Instant Client version" >&5
++echo "configure:65270: 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 +65068,7 @@ esac
+@@ -63749,7 +65745,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:65072: checking for Adabas support" >&5
++echo "configure:65749: checking for Adabas support" >&5
      if test "$PHP_ADABAS" = "yes"; then
        PHP_ADABAS=/usr/local
      fi
-@@ -63952,7 +65271,7 @@ esac
+@@ -63952,7 +65948,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:65275: checking for SAP DB support" >&5
++echo "configure:65952: checking for SAP DB support" >&5
      if test "$PHP_SAPDB" = "yes"; then
        PHP_SAPDB=/usr/local
      fi
-@@ -64085,7 +65404,7 @@ esac
+@@ -64085,7 +66081,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:65408: checking for Solid support" >&5
++echo "configure:66085: checking for Solid support" >&5
      if test "$PHP_SOLID" = "yes"; then
        PHP_SOLID=/usr/local/solid
      fi
-@@ -64112,7 +65431,7 @@ EOF
+@@ -64112,7 +66108,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:65435: checking Solid library file" >&5  
++echo "configure:66112: 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 +65552,7 @@ esac
+@@ -64233,7 +66229,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:65556: checking for IBM DB2 support" >&5
++echo "configure:66233: 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 +65583,7 @@ fi
+@@ -64264,7 +66260,7 @@ fi
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 64268 "configure"
-+#line 65587 "configure"
++#line 66264 "configure"
  #include "confdefs.h"
  
      
-@@ -64275,7 +65594,7 @@ else
+@@ -64275,7 +66271,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:65598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:66275: \"$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 +65675,7 @@ esac
+@@ -64356,7 +66352,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:65679: checking for ODBCRouter.com support" >&5
++echo "configure:66356: checking for ODBCRouter.com support" >&5
      if test "$PHP_ODBCROUTER" = "yes"; then
        PHP_ODBCROUTER=/usr
      fi
-@@ -64420,7 +65739,7 @@ esac
+@@ -64420,7 +66416,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:65743: checking for Empress support" >&5
++echo "configure:66420: checking for Empress support" >&5
      if test "$PHP_EMPRESS" = "yes"; then
        ODBC_INCDIR=$EMPRESSPATH/include/odbc
        ODBC_LIBDIR=$EMPRESSPATH/shlib
-@@ -64438,7 +65757,7 @@ EOF
+@@ -64438,7 +66434,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:65761: checking Empress library file" >&5
++echo "configure:66438: 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 +65813,7 @@ esac
+@@ -64494,7 +66490,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:65817: checking for Empress local access support" >&5
++echo "configure:66494: 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 +65847,7 @@ EOF
+@@ -64528,7 +66524,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:65851: checking Empress local access library file" >&5
++echo "configure:66528: 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 +65903,7 @@ esac
+@@ -64584,7 +66580,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:65907: checking for Birdstep support" >&5
++echo "configure:66584: 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 +66015,7 @@ esac
+@@ -64696,7 +66692,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:66019: checking for a custom ODBC support" >&5
++echo "configure:66696: checking for a custom ODBC support" >&5
      if test "$PHP_CUSTOM_ODBC" = "yes"; then
        PHP_CUSTOM_ODBC=/usr/local
      fi
-@@ -64760,7 +66079,7 @@ esac
+@@ -64760,7 +66756,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:66083: checking for iODBC support" >&5
++echo "configure:66760: checking for iODBC support" >&5
      if test "$PHP_IODBC" = "yes"; then
        PHP_IODBC=/usr/local
      fi
-@@ -64906,7 +66225,7 @@ esac
+@@ -64906,7 +66902,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:66229: checking for Easysoft ODBC-ODBC Bridge support" >&5
++echo "configure:66906: checking for Easysoft ODBC-ODBC Bridge support" >&5
      if test "$PHP_ESOOB" = "yes"; then
        PHP_ESOOB=/usr/local/easysoft/oob/client
      fi
-@@ -64970,7 +66289,7 @@ esac
+@@ -64970,7 +66966,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:66293: checking for unixODBC support" >&5
++echo "configure:66970: checking for unixODBC support" >&5
      if test "$PHP_UNIXODBC" = "yes"; then
        PHP_UNIXODBC=/usr/local
      fi
-@@ -65039,7 +66358,7 @@ esac
+@@ -65039,7 +67035,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:66362: checking for DBMaker support" >&5
++echo "configure:67039: 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 +66920,7 @@ fi
+@@ -65601,7 +67597,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:66924: checking whether to enable pcntl support" >&5
++echo "configure:67601: 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 +66964,12 @@ if test "$PHP_PCNTL" != "no"; then
+@@ -65645,12 +67641,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:66968: checking for $ac_func" >&5
++echo "configure:67645: 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 66973 "configure"
++#line 67650 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -65673,7 +66992,7 @@ $ac_func();
+@@ -65673,7 +67669,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:66996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:67673: \"$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 +67023,12 @@ done
+@@ -65704,12 +67700,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:67027: checking for $ac_func" >&5
++echo "configure:67704: 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 67032 "configure"
++#line 67709 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -65732,7 +67051,7 @@ $ac_func();
+@@ -65732,7 +67728,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:67055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:67732: \"$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 +67082,12 @@ done
+@@ -65763,12 +67759,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:67086: checking for $ac_func" >&5
++echo "configure:67763: 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 67091 "configure"
++#line 67768 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -65791,7 +67110,7 @@ $ac_func();
+@@ -65791,7 +67787,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:67114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:67791: \"$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 +67141,12 @@ done
+@@ -65822,12 +67818,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:67145: checking for $ac_func" >&5
++echo "configure:67822: 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 67150 "configure"
++#line 67827 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -65850,7 +67169,7 @@ $ac_func();
+@@ -65850,7 +67846,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:67173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:67850: \"$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 +67494,7 @@ fi
+@@ -66175,7 +68171,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:67498: checking whether to enable PDO support" >&5
++echo "configure:68175: 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 +67928,7 @@ fi
+@@ -66609,7 +68605,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:67932: checking for PDO_DBLIB support via FreeTDS" >&5
++echo "configure:68609: 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 +68145,13 @@ if test "$PHP_PDO_DBLIB" != "no"; then
+@@ -66826,13 +68822,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:68149: checking for PDO includes" >&5
++echo "configure:68826: 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:68155: checking for PDO includes" >&5
++echo "configure:68832: 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 +68465,7 @@ EOF
+@@ -67146,7 +69142,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:68469: checking for dnet_addr in -ldnet_stub" >&5
++echo "configure:69146: 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 +68473,7 @@ else
+@@ -67154,7 +69150,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ldnet_stub  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 67158 "configure"
-+#line 68477 "configure"
++#line 69154 "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 +68484,7 @@ int main() {
+@@ -67165,7 +69161,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:68488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:69165: \"$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 +68645,7 @@ fi
+@@ -67326,7 +69322,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:68649: checking for Firebird support for PDO" >&5
++echo "configure:69326: 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 +68799,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; then
+@@ -67480,7 +69476,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; the
    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:68803: checking for isc_detach_database in -lfbclient" >&5
++echo "configure:69480: 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 +68807,7 @@ else
+@@ -67488,7 +69484,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lfbclient  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 67492 "configure"
-+#line 68811 "configure"
++#line 69488 "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 +68818,7 @@ int main() {
+@@ -67499,7 +69495,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:68822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:69499: \"$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 +68945,7 @@ else
+@@ -67626,7 +69622,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:68949: checking for isc_detach_database in -lgds" >&5
++echo "configure:69626: 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 +68953,7 @@ else
+@@ -67634,7 +69630,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lgds  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 67638 "configure"
-+#line 68957 "configure"
++#line 69634 "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 +68964,7 @@ int main() {
+@@ -67645,7 +69641,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:68968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:69645: \"$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 +69091,7 @@ else
+@@ -67772,7 +69768,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:69095: checking for isc_detach_database in -lib_util" >&5
++echo "configure:69772: 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 +69099,7 @@ else
+@@ -67780,7 +69776,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lib_util  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 67784 "configure"
-+#line 69103 "configure"
++#line 69780 "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 +69110,7 @@ int main() {
+@@ -67791,7 +69787,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:69114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:69791: \"$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 +69155,13 @@ fi
+@@ -67836,13 +69832,13 @@ fi
   
    
    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
 -echo "configure:67840: checking for PDO includes" >&5
-+echo "configure:69159: checking for PDO includes" >&5
++echo "configure:69836: 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:69165: checking for PDO includes" >&5
++echo "configure:69842: 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 +69633,7 @@ fi
+@@ -68314,7 +70310,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:69637: checking for MySQL support for PDO" >&5
++echo "configure:70314: 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 +69678,7 @@ if test -z "$PHP_ZLIB_DIR"; then
+@@ -68359,7 +70355,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:69682: checking for the location of libz" >&5
++echo "configure:70359: 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 +69742,14 @@ EOF
+@@ -68423,14 +70419,14 @@ EOF
  
  
      echo $ac_n "checking for mysql_config""... $ac_c" 1>&6
 -echo "configure:68427: checking for mysql_config" >&5
-+echo "configure:69746: checking for mysql_config" >&5
++echo "configure:70423: 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
@@ -11338,191 +13339,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:69753: checking for $ac_word" >&5
++echo "configure:70430: 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 +69793,7 @@ fi
+@@ -68474,7 +70470,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:69797: checking for mysql install under $PDO_MYSQL_DIR" >&5
++echo "configure:70474: 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 +69947,7 @@ echo "configure:68478: checking for mysql install under $PDO_MYSQL_DIR" >&5
+@@ -68628,7 +70624,7 @@ echo "configure:68478: checking for mysq
    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:69951: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
++echo "configure:70628: 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 +69955,7 @@ else
+@@ -68636,7 +70632,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$PDO_MYSQL_LIBNAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 68640 "configure"
-+#line 69959 "configure"
++#line 70636 "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 +69966,7 @@ int main() {
+@@ -68647,7 +70643,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:69970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:70647: \"$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 +70319,7 @@ else
+@@ -69000,7 +70996,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:70323: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
++echo "configure:71000: 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 +70327,7 @@ else
+@@ -69008,7 +71004,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$PDO_MYSQL_LIBNAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 69012 "configure"
-+#line 70331 "configure"
++#line 71008 "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 +70338,7 @@ int main() {
+@@ -69019,7 +71015,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:70342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:71019: \"$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 +70493,7 @@ fi
+@@ -69174,7 +71170,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:70497: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5
++echo "configure:71174: 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 +70501,7 @@ else
+@@ -69182,7 +71178,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$PDO_MYSQL_LIBNAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 69186 "configure"
-+#line 70505 "configure"
++#line 71182 "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 +70512,7 @@ int main() {
+@@ -69193,7 +71189,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:70516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:71193: \"$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 +70686,12 @@ fi
+@@ -69367,12 +71363,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:70690: checking for $ac_func" >&5
++echo "configure:71367: 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 70695 "configure"
++#line 71372 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -69395,7 +70714,7 @@ $ac_func();
+@@ -69395,7 +71391,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:70718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:71395: \"$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 +70744,13 @@ done
+@@ -69425,13 +71421,13 @@ done
    
      
    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
 -echo "configure:69429: checking for PDO includes" >&5
-+echo "configure:70748: checking for PDO includes" >&5
++echo "configure:71425: 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:70754: checking for PDO includes" >&5
++echo "configure:71431: 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 +71135,7 @@ SUPPORTED_LIB_VERS="9.0 10.1 11.1"  # This caters for all Oracle 9.x, 10.x and 1
+@@ -69816,7 +71812,7 @@ SUPPORTED_LIB_VERS="9.0 10.1 11.1"  # Th
  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:71139: checking Oracle OCI support for PDO" >&5
++echo "configure:71816: 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 +71182,7 @@ if test "$PHP_PDO_OCI" != "no"; then
+@@ -69863,7 +71859,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:71186: checking Oracle Install-Dir" >&5
++echo "configure:71863: 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 +71191,7 @@ echo "configure:69867: checking Oracle Install-Dir" >&5
+@@ -69872,7 +71868,7 @@ echo "configure:69867: checking Oracle I
    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:71195: checking if that is sane" >&5
++echo "configure:71872: 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 +71204,7 @@ You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_
+@@ -69885,7 +71881,7 @@ You need to tell me where to find your O
      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:71208: checking for oci.h" >&5
++echo "configure:71885: 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 +71353,7 @@ echo "configure:69889: checking for oci.h" >&5
+@@ -70034,7 +72030,7 @@ echo "configure:69889: checking for oci.
    else
      
    echo $ac_n "checking size of long int""... $ac_c" 1>&6
 -echo "configure:70038: checking size of long int" >&5
-+echo "configure:71357: checking size of long int" >&5
++echo "configure:72034: 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 +71361,19 @@ else
+@@ -70042,18 +72038,19 @@ else
    ac_cv_sizeof_long_int=4
  else
    cat > conftest.$ac_ext <<EOF
 -#line 70046 "configure"
-+#line 71365 "configure"
++#line 72042 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -11538,1635 +13539,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:71377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:72054: \"$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 +71393,7 @@ EOF
+@@ -70073,7 +72070,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:71397: checking if we're on a 64-bit platform" >&5
++echo "configure:72074: 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 +71403,7 @@ echo "configure:70077: checking if we're on a 64-bit platform" >&5
+@@ -70083,7 +72080,7 @@ echo "configure:70077: checking if we're
    fi
  
    echo $ac_n "checking OCI8 libraries dir""... $ac_c" 1>&6
 -echo "configure:70087: checking OCI8 libraries dir" >&5
-+echo "configure:71407: checking OCI8 libraries dir" >&5
++echo "configure:72084: 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 +71770,7 @@ echo "configure:70087: checking OCI8 libraries dir" >&5
+@@ -70450,7 +72447,7 @@ echo "configure:70087: checking OCI8 lib
      fi
      
    echo $ac_n "checking Oracle version""... $ac_c" 1>&6
 -echo "configure:70454: checking Oracle version" >&5
-+echo "configure:71774: checking Oracle version" >&5
++echo "configure:72451: 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 +71952,7 @@ echo "configure:70454: checking Oracle version" >&5
+@@ -70632,7 +72629,7 @@ echo "configure:70454: checking Oracle v
    done
  
    echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6
 -echo "configure:70636: checking for OCIEnvCreate in -lclntsh" >&5
-+echo "configure:71956: checking for OCIEnvCreate in -lclntsh" >&5
++echo "configure:72633: 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 +71960,7 @@ else
+@@ -70640,7 +72637,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lclntsh  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 70644 "configure"
-+#line 71964 "configure"
++#line 72641 "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 +71971,7 @@ int main() {
+@@ -70651,7 +72648,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:71975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:72652: \"$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 +72105,7 @@ fi
+@@ -70785,7 +72782,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:72109: checking for OCIEnvNlsCreate in -lclntsh" >&5
++echo "configure:72786: 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 +72113,7 @@ else
+@@ -70793,7 +72790,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lclntsh  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 70797 "configure"
-+#line 72117 "configure"
++#line 72794 "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 +72124,7 @@ int main() {
+@@ -70804,7 +72801,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:72128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:72805: \"$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 +72258,7 @@ fi
+@@ -70938,7 +72935,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:72262: checking for OCILobIsTemporary in -lclntsh" >&5
++echo "configure:72939: 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 +72266,7 @@ else
+@@ -70946,7 +72943,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lclntsh  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 70950 "configure"
-+#line 72270 "configure"
++#line 72947 "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 +72277,7 @@ int main() {
+@@ -70957,7 +72954,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:72281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:72958: \"$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 +72407,7 @@ else
+@@ -71087,7 +73084,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:72411: checking for OCILobIsTemporary in -locijdbc8" >&5
++echo "configure:73088: 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 +72415,7 @@ else
+@@ -71095,7 +73092,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-locijdbc8  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 71099 "configure"
-+#line 72419 "configure"
++#line 73096 "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 +72426,7 @@ int main() {
+@@ -71106,7 +73103,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:72430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:73107: \"$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 +72587,7 @@ fi
+@@ -71267,7 +73264,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:72591: checking for OCICollAssign in -lclntsh" >&5
++echo "configure:73268: 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 +72595,7 @@ else
+@@ -71275,7 +73272,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lclntsh  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 71279 "configure"
-+#line 72599 "configure"
++#line 73276 "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 +72606,7 @@ int main() {
+@@ -71286,7 +73283,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:72610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:73287: \"$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 +72740,7 @@ fi
+@@ -71420,7 +73417,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:72744: checking for OCIStmtFetch2 in -lclntsh" >&5
++echo "configure:73421: 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 +72748,7 @@ else
+@@ -71428,7 +73425,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lclntsh  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 71432 "configure"
-+#line 72752 "configure"
++#line 73429 "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 +72759,7 @@ int main() {
+@@ -71439,7 +73436,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:72763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:73440: \"$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 +72798,13 @@ fi
+@@ -71478,13 +73475,13 @@ fi
    
      
    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
 -echo "configure:71482: checking for PDO includes" >&5
-+echo "configure:72802: checking for PDO includes" >&5
++echo "configure:73479: 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:72808: checking for PDO includes" >&5
++echo "configure:73485: 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 +73172,7 @@ fi
+@@ -71852,7 +73849,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:73176: checking for ODBC v3 support for PDO" >&5
++echo "configure:73853: 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 +73224,13 @@ if test "$PHP_PDO_ODBC" != "no"; then
+@@ -71904,13 +73901,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:73228: checking for PDO includes" >&5
++echo "configure:73905: 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:73234: checking for PDO includes" >&5
++echo "configure:73911: 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 +73251,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6
+@@ -71931,7 +73928,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:73255: checking for selected PDO ODBC flavour" >&5
++echo "configure:73932: 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 +73330,7 @@ echo "configure:71935: checking for selected PDO ODBC flavour" >&5
+@@ -72010,7 +74007,7 @@ echo "configure:71935: checking for sele
  
    
    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:73334: checking for odbc.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:74011: 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 +73344,7 @@ EOF
+@@ -72024,7 +74021,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:73348: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:74025: 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 +73358,7 @@ EOF
+@@ -72038,7 +74035,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:73362: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:74039: 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 +73372,7 @@ EOF
+@@ -72052,7 +74049,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:73376: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:74053: 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 +73386,7 @@ EOF
+@@ -72066,7 +74063,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:73390: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:74067: 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 +73400,7 @@ EOF
+@@ -72080,7 +74077,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:73404: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:74081: 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 +73414,7 @@ EOF
+@@ -72094,7 +74091,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:73418: checking for sql.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:74095: 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 +73428,7 @@ EOF
+@@ -72108,7 +74105,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:73432: checking for isql.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:74109: 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 +73442,7 @@ EOF
+@@ -72122,7 +74119,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:73446: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:74123: 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 +73456,7 @@ EOF
+@@ -72136,7 +74133,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:73460: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:74137: 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 +73470,7 @@ EOF
+@@ -72150,7 +74147,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:73474: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:74151: 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 +73484,7 @@ EOF
+@@ -72164,7 +74161,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:73488: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:74165: 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 +73498,7 @@ EOF
+@@ -72178,7 +74175,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:73502: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:74179: 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 +73512,7 @@ EOF
+@@ -72192,7 +74189,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:73516: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:74193: 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 +73526,7 @@ EOF
+@@ -72206,7 +74203,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:73530: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:74207: 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 +73540,7 @@ EOF
+@@ -72220,7 +74217,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:73544: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:74221: 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 +73554,7 @@ EOF
+@@ -72234,7 +74231,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:73558: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:74235: 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 +73568,7 @@ EOF
+@@ -72248,7 +74245,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:73572: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5
++echo "configure:74249: 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 +73774,7 @@ EOF
+@@ -72454,7 +74451,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:73778: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5
++echo "configure:74455: 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 +73782,7 @@ else
+@@ -72462,7 +74459,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$pdo_odbc_def_lib  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 72466 "configure"
-+#line 73786 "configure"
++#line 74463 "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 +73793,7 @@ int main() {
+@@ -72473,7 +74470,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:73797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:74474: \"$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 +73908,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+@@ -72588,7 +74585,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
    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:73912: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5
++echo "configure:74589: 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 +73916,7 @@ else
+@@ -72596,7 +74593,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$pdo_odbc_def_lib  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 72600 "configure"
-+#line 73920 "configure"
++#line 74597 "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 +73927,7 @@ int main() {
+@@ -72607,7 +74604,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:73931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:74608: \"$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 +74301,7 @@ fi
+@@ -72981,7 +74978,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:74305: checking for PostgreSQL support for PDO" >&5
++echo "configure:74982: 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 +74360,7 @@ if test "$PHP_PDO_PGSQL" != "no"; then
+@@ -73040,7 +75037,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:74364: checking for pg_config" >&5
++echo "configure:75041: 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 +74424,13 @@ EOF
+@@ -73104,13 +75101,13 @@ EOF
  
  
    echo $ac_n "checking for openssl dependencies""... $ac_c" 1>&6
 -echo "configure:73108: checking for openssl dependencies" >&5
-+echo "configure:74428: checking for openssl dependencies" >&5
++echo "configure:75105: 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:74434: checking for $ac_word" >&5
++echo "configure:75111: 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 +74474,7 @@ fi
+@@ -73154,7 +75151,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:74478: checking for PQparameterStatus in -lpq" >&5
++echo "configure:75155: 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 +74482,7 @@ else
+@@ -73162,7 +75159,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 73166 "configure"
-+#line 74486 "configure"
++#line 75163 "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 +74493,7 @@ int main() {
+@@ -73173,7 +75170,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:74497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:75174: \"$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 +74522,7 @@ fi
+@@ -73202,7 +75199,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:74526: checking for PQprepare in -lpq" >&5
++echo "configure:75203: 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 +74530,7 @@ else
+@@ -73210,7 +75207,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 73214 "configure"
-+#line 74534 "configure"
++#line 75211 "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 +74541,7 @@ int main() {
+@@ -73221,7 +75218,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:74545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:75222: \"$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 +74565,7 @@ else
+@@ -73245,7 +75242,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:74569: checking for PQescapeStringConn in -lpq" >&5
++echo "configure:75246: 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 +74573,7 @@ else
+@@ -73253,7 +75250,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 73257 "configure"
-+#line 74577 "configure"
++#line 75254 "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 +74584,7 @@ int main() {
+@@ -73264,7 +75261,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:74588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:75265: \"$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 +74608,7 @@ else
+@@ -73288,7 +75285,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:74612: checking for PQescapeByteaConn in -lpq" >&5
++echo "configure:75289: 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 +74616,7 @@ else
+@@ -73296,7 +75293,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 73300 "configure"
-+#line 74620 "configure"
++#line 75297 "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 +74627,7 @@ int main() {
+@@ -73307,7 +75304,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:74631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:75308: \"$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 +74652,7 @@ fi
+@@ -73332,7 +75329,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:74656: checking for pg_encoding_to_char in -lpq" >&5
++echo "configure:75333: 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 +74660,7 @@ else
+@@ -73340,7 +75337,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 73344 "configure"
-+#line 74664 "configure"
++#line 75341 "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 +74671,7 @@ int main() {
+@@ -73351,7 +75348,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:74675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:75352: \"$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 +74835,13 @@ fi
+@@ -73515,13 +75512,13 @@ fi
    
      
    echo $ac_n "checking for PDO includes""... $ac_c" 1>&6
 -echo "configure:73519: checking for PDO includes" >&5
-+echo "configure:74839: checking for PDO includes" >&5
++echo "configure:75516: 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:74845: checking for PDO includes" >&5
++echo "configure:75522: 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 +75181,7 @@ fi
+@@ -73861,7 +75858,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:75185: checking for sqlite 3 support for PDO" >&5
++echo "configure:75862: 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 +75230,13 @@ if test "$PHP_PDO_SQLITE" != "no"; then
+@@ -73910,13 +75907,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:75234: checking for PDO includes" >&5
++echo "configure:75911: 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:75240: checking for PDO includes" >&5
++echo "configure:75917: 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 +75265,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6
+@@ -73945,7 +75942,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:75269: checking for sqlite3 files in default path" >&5
++echo "configure:75946: 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 +75411,7 @@ echo "configure:73949: checking for sqlite3 files in default path" >&5
+@@ -74091,7 +76088,7 @@ echo "configure:73949: checking for sqli
    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:75415: checking for $LIBSYMBOL in -l$LIBNAME" >&5
++echo "configure:76092: 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 +75419,7 @@ else
+@@ -74099,7 +76096,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$LIBNAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 74103 "configure"
-+#line 75423 "configure"
++#line 76100 "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 +75430,7 @@ int main() {
+@@ -74110,7 +76107,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:75434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:76111: \"$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 +75660,7 @@ fi
+@@ -74340,7 +76337,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:75664: checking for sqlite3_key in -lsqlite3" >&5
++echo "configure:76341: 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 +75668,7 @@ else
+@@ -74348,7 +76345,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsqlite3  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 74352 "configure"
-+#line 75672 "configure"
++#line 76349 "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 +75679,7 @@ int main() {
+@@ -74359,7 +76356,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:75683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:76360: \"$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 +76420,12 @@ but you've either not enabled sqlite3, or have disabled it.
+@@ -75100,12 +77097,12 @@ but you've either not enabled sqlite3, o
        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:76424: checking for $ac_func" >&5
++echo "configure:77101: 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 76429 "configure"
++#line 77106 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -75128,7 +76448,7 @@ $ac_func();
+@@ -75128,7 +77125,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:76452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77129: \"$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 +76476,17 @@ done
+@@ -75156,17 +77153,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:76480: checking for $ac_hdr" >&5
++echo "configure:77157: 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 76485 "configure"
++#line 77162 "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:76490: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:77167: \"$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 +76610,7 @@ done
+@@ -75290,7 +77287,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:76614: checking for fdatasync in -lrt" >&5
++echo "configure:77291: 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 +76618,7 @@ else
+@@ -75298,7 +77295,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lrt  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75302 "configure"
-+#line 76622 "configure"
++#line 77299 "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 +76629,7 @@ int main() {
+@@ -75309,7 +77306,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:76633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77310: \"$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 +76710,7 @@ fi
+@@ -75390,7 +77387,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:76714: checking for PostgreSQL support" >&5
++echo "configure:77391: 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 +76764,7 @@ if test "$PHP_PGSQL" != "no"; then
+@@ -75444,7 +77441,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:76768: checking for pg_config" >&5
++echo "configure:77445: 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 +76832,7 @@ EOF
+@@ -75512,7 +77509,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:76836: checking for PQescapeString in -lpq" >&5
++echo "configure:77513: 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 +76840,7 @@ else
+@@ -75520,7 +77517,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75524 "configure"
-+#line 76844 "configure"
++#line 77521 "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 +76851,7 @@ int main() {
+@@ -75531,7 +77528,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:76855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77532: \"$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 +76875,7 @@ else
+@@ -75555,7 +77552,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:76879: checking for PQunescapeBytea in -lpq" >&5
++echo "configure:77556: 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 +76883,7 @@ else
+@@ -75563,7 +77560,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75567 "configure"
-+#line 76887 "configure"
++#line 77564 "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 +76894,7 @@ int main() {
+@@ -75574,7 +77571,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:76898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77575: \"$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 +76918,7 @@ else
+@@ -75598,7 +77595,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:76922: checking for PQsetnonblocking in -lpq" >&5
++echo "configure:77599: 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 +76926,7 @@ else
+@@ -75606,7 +77603,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75610 "configure"
-+#line 76930 "configure"
++#line 77607 "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 +76937,7 @@ int main() {
+@@ -75617,7 +77614,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:76941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77618: \"$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 +76961,7 @@ else
+@@ -75641,7 +77638,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:76965: checking for PQcmdTuples in -lpq" >&5
++echo "configure:77642: 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 +76969,7 @@ else
+@@ -75649,7 +77646,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75653 "configure"
-+#line 76973 "configure"
++#line 77650 "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 +76980,7 @@ int main() {
+@@ -75660,7 +77657,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:76984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77661: \"$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 +77004,7 @@ else
+@@ -75684,7 +77681,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:77008: checking for PQoidValue in -lpq" >&5
++echo "configure:77685: 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 +77012,7 @@ else
+@@ -75692,7 +77689,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75696 "configure"
-+#line 77016 "configure"
++#line 77693 "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 +77023,7 @@ int main() {
+@@ -75703,7 +77700,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:77027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77704: \"$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 +77047,7 @@ else
+@@ -75727,7 +77724,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:77051: checking for PQclientEncoding in -lpq" >&5
++echo "configure:77728: 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 +77055,7 @@ else
+@@ -75735,7 +77732,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75739 "configure"
-+#line 77059 "configure"
++#line 77736 "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 +77066,7 @@ int main() {
+@@ -75746,7 +77743,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:77070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77747: \"$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 +77090,7 @@ else
+@@ -75770,7 +77767,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:77094: checking for PQparameterStatus in -lpq" >&5
++echo "configure:77771: 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 +77098,7 @@ else
+@@ -75778,7 +77775,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75782 "configure"
-+#line 77102 "configure"
++#line 77779 "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 +77109,7 @@ int main() {
+@@ -75789,7 +77786,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:77113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77790: \"$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 +77133,7 @@ else
+@@ -75813,7 +77810,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:77137: checking for PQprotocolVersion in -lpq" >&5
++echo "configure:77814: 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 +77141,7 @@ else
+@@ -75821,7 +77818,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75825 "configure"
-+#line 77145 "configure"
++#line 77822 "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 +77152,7 @@ int main() {
+@@ -75832,7 +77829,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:77156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77833: \"$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 +77176,7 @@ else
+@@ -75856,7 +77853,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:77180: checking for PQtransactionStatus in -lpq" >&5
++echo "configure:77857: 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 +77184,7 @@ else
+@@ -75864,7 +77861,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75868 "configure"
-+#line 77188 "configure"
++#line 77865 "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 +77195,7 @@ int main() {
+@@ -75875,7 +77872,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:77199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77876: \"$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 +77219,7 @@ else
+@@ -75899,7 +77896,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:77223: checking for PQexecParams in -lpq" >&5
++echo "configure:77900: 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 +77227,7 @@ else
+@@ -75907,7 +77904,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75911 "configure"
-+#line 77231 "configure"
++#line 77908 "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 +77238,7 @@ int main() {
+@@ -75918,7 +77915,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:77242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77919: \"$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 +77262,7 @@ else
+@@ -75942,7 +77939,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:77266: checking for PQprepare in -lpq" >&5
++echo "configure:77943: 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 +77270,7 @@ else
+@@ -75950,7 +77947,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75954 "configure"
-+#line 77274 "configure"
++#line 77951 "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 +77281,7 @@ int main() {
+@@ -75961,7 +77958,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:77285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:77962: \"$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 +77305,7 @@ else
+@@ -75985,7 +77982,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:77309: checking for PQexecPrepared in -lpq" >&5
++echo "configure:77986: 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 +77313,7 @@ else
+@@ -75993,7 +77990,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 75997 "configure"
-+#line 77317 "configure"
++#line 77994 "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 +77324,7 @@ int main() {
+@@ -76004,7 +78001,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:77328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:78005: \"$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 +77348,7 @@ else
+@@ -76028,7 +78025,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:77352: checking for PQresultErrorField in -lpq" >&5
++echo "configure:78029: 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 +77356,7 @@ else
+@@ -76036,7 +78033,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76040 "configure"
-+#line 77360 "configure"
++#line 78037 "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 +77367,7 @@ int main() {
+@@ -76047,7 +78044,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:77371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:78048: \"$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 +77391,7 @@ else
+@@ -76071,7 +78068,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:77395: checking for PQsendQueryParams in -lpq" >&5
++echo "configure:78072: 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 +77399,7 @@ else
+@@ -76079,7 +78076,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76083 "configure"
-+#line 77403 "configure"
++#line 78080 "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 +77410,7 @@ int main() {
+@@ -76090,7 +78087,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:77414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:78091: \"$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 +77434,7 @@ else
+@@ -76114,7 +78111,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:77438: checking for PQsendPrepare in -lpq" >&5
++echo "configure:78115: 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 +77442,7 @@ else
+@@ -76122,7 +78119,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76126 "configure"
-+#line 77446 "configure"
++#line 78123 "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 +77453,7 @@ int main() {
+@@ -76133,7 +78130,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:77457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:78134: \"$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 +77477,7 @@ else
+@@ -76157,7 +78154,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:77481: checking for PQsendQueryPrepared in -lpq" >&5
++echo "configure:78158: 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 +77485,7 @@ else
+@@ -76165,7 +78162,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76169 "configure"
-+#line 77489 "configure"
++#line 78166 "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 +77496,7 @@ int main() {
+@@ -76176,7 +78173,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:77500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:78177: \"$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 +77520,7 @@ else
+@@ -76200,7 +78197,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:77524: checking for PQputCopyData in -lpq" >&5
++echo "configure:78201: 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 +77528,7 @@ else
+@@ -76208,7 +78205,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76212 "configure"
-+#line 77532 "configure"
++#line 78209 "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 +77539,7 @@ int main() {
+@@ -76219,7 +78216,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:77543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:78220: \"$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 +77563,7 @@ else
+@@ -76243,7 +78240,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:77567: checking for PQputCopyEnd in -lpq" >&5
++echo "configure:78244: 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 +77571,7 @@ else
+@@ -76251,7 +78248,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76255 "configure"
-+#line 77575 "configure"
++#line 78252 "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 +77582,7 @@ int main() {
+@@ -76262,7 +78259,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:77586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:78263: \"$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 +77606,7 @@ else
+@@ -76286,7 +78283,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:77610: checking for PQgetCopyData in -lpq" >&5
++echo "configure:78287: 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 +77614,7 @@ else
+@@ -76294,7 +78291,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76298 "configure"
-+#line 77618 "configure"
++#line 78295 "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 +77625,7 @@ int main() {
+@@ -76305,7 +78302,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:77629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:78306: \"$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 +77649,7 @@ else
+@@ -76329,7 +78326,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:77653: checking for PQfreemem in -lpq" >&5
++echo "configure:78330: 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 +77657,7 @@ else
+@@ -76337,7 +78334,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76341 "configure"
-+#line 77661 "configure"
++#line 78338 "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 +77668,7 @@ int main() {
+@@ -76348,7 +78345,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:77672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:78349: \"$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 +77692,7 @@ else
+@@ -76372,7 +78369,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:77696: checking for PQsetErrorVerbosity in -lpq" >&5
++echo "configure:78373: 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 +77700,7 @@ else
+@@ -76380,7 +78377,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76384 "configure"
-+#line 77704 "configure"
++#line 78381 "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 +77711,7 @@ int main() {
+@@ -76391,7 +78388,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:77715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:78392: \"$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 +77735,7 @@ else
+@@ -76415,7 +78412,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:77739: checking for PQftable in -lpq" >&5
++echo "configure:78416: 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 +77743,7 @@ else
+@@ -76423,7 +78420,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76427 "configure"
-+#line 77747 "configure"
++#line 78424 "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 +77754,7 @@ int main() {
+@@ -76434,7 +78431,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:77758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:78435: \"$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 +77778,7 @@ else
+@@ -76458,7 +78455,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:77782: checking for PQescapeStringConn in -lpq" >&5
++echo "configure:78459: 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 +77786,7 @@ else
+@@ -76466,7 +78463,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76470 "configure"
-+#line 77790 "configure"
++#line 78467 "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 +77797,7 @@ int main() {
+@@ -76477,7 +78474,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:77801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:78478: \"$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 +77821,7 @@ else
+@@ -76501,7 +78498,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:77825: checking for PQescapeByteaConn in -lpq" >&5
++echo "configure:78502: 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 +77829,7 @@ else
+@@ -76509,7 +78506,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76513 "configure"
-+#line 77833 "configure"
++#line 78510 "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 +77840,7 @@ int main() {
+@@ -76520,7 +78517,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:77844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:78521: \"$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 +77864,7 @@ else
+@@ -76544,7 +78541,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:77868: checking for pg_encoding_to_char in -lpq" >&5
++echo "configure:78545: 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 +77872,7 @@ else
+@@ -76552,7 +78549,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76556 "configure"
-+#line 77876 "configure"
++#line 78553 "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 +77883,7 @@ int main() {
+@@ -76563,7 +78560,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:77887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:78564: \"$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 +77907,7 @@ else
+@@ -76587,7 +78584,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:77911: checking for lo_create in -lpq" >&5
++echo "configure:78588: 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 +77915,7 @@ else
+@@ -76595,7 +78592,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76599 "configure"
-+#line 77919 "configure"
++#line 78596 "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 +77926,7 @@ int main() {
+@@ -76606,7 +78603,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:77930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:78607: \"$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 +77950,7 @@ else
+@@ -76630,7 +78627,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:77954: checking for lo_import_with_oid in -lpq" >&5
++echo "configure:78631: 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 +77958,7 @@ else
+@@ -76638,7 +78635,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lpq  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 76642 "configure"
-+#line 77962 "configure"
++#line 78639 "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 +77969,7 @@ int main() {
+@@ -76649,7 +78646,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:77973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:78650: \"$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 +78429,7 @@ fi
+@@ -77109,7 +79106,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:78433: checking for phar archive support" >&5
++echo "configure:79110: 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 +78763,7 @@ EOF
+@@ -77443,7 +79440,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:78767: checking for phar openssl support" >&5
++echo "configure:79444: 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 +78838,7 @@ fi
+@@ -77518,7 +79515,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:78842: checking whether to enable POSIX-like functions" >&5
++echo "configure:79519: 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 +79180,17 @@ EOF
+@@ -77860,17 +79857,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:79184: checking for $ac_hdr" >&5
++echo "configure:79861: 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 79189 "configure"
++#line 79866 "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:79194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:79871: \"$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 +79220,12 @@ done
+@@ -77900,12 +79897,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:79224: checking for $ac_func" >&5
++echo "configure:79901: 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 79229 "configure"
++#line 79906 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -77928,7 +79248,7 @@ $ac_func();
+@@ -77928,7 +79925,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:79252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:79929: \"$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 +79274,14 @@ done
+@@ -77954,14 +79951,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:79278: checking for working ttyname_r() implementation" >&5
++echo "configure:79955: 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
@@ -13174,1090 +15175,1090 @@
  else
    cat > conftest.$ac_ext <<EOF
 -#line 77965 "configure"
-+#line 79285 "configure"
++#line 79962 "configure"
  #include "confdefs.h"
  
  #include <unistd.h>
-@@ -77974,7 +79294,7 @@ int main(int argc, char *argv[])
+@@ -77974,7 +79971,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:79298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:79975: \"$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 +79316,13 @@ fi
+@@ -77996,13 +79993,13 @@ fi
  
  
    echo $ac_n "checking for utsname.domainname""... $ac_c" 1>&6
 -echo "configure:78000: checking for utsname.domainname" >&5
-+echo "configure:79320: checking for utsname.domainname" >&5
++echo "configure:79997: 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 79326 "configure"
++#line 80003 "configure"
  #include "confdefs.h"
  
        #define _GNU_SOURCE
-@@ -78014,7 +79334,7 @@ int main() {
+@@ -78014,7 +80011,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:79338: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:80015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
        ac_cv_have_utsname_domainname=yes
-@@ -78045,7 +79365,7 @@ fi
+@@ -78045,7 +80042,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:79369: checking for PSPELL support" >&5
++echo "configure:80046: 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 +79915,7 @@ EOF
+@@ -78595,7 +80592,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:79919: checking for new_aspell_config in -laspell" >&5
++echo "configure:80596: 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 +79923,7 @@ else
+@@ -78603,7 +80600,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-laspell  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 78607 "configure"
-+#line 79927 "configure"
++#line 80604 "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 +79934,7 @@ int main() {
+@@ -78614,7 +80611,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:79938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:80615: \"$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 +80108,7 @@ fi
+@@ -78788,7 +80785,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:80112: checking for libedit readline replacement" >&5
++echo "configure:80789: 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 +80153,7 @@ if test "$PHP_LIBEDIT" = "no"; then
+@@ -78833,7 +80830,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:80157: checking for readline support" >&5
++echo "configure:80834: 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 +80239,7 @@ if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
+@@ -78919,7 +80916,7 @@ if test "$PHP_READLINE" && test "$PHP_RE
  
    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:80243: checking for tgetent in -lncurses" >&5
++echo "configure:80920: 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 +80247,7 @@ else
+@@ -78927,7 +80924,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lncurses  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 78931 "configure"
-+#line 80251 "configure"
++#line 80928 "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 +80258,7 @@ int main() {
+@@ -78938,7 +80935,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:80262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:80939: \"$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 +80303,7 @@ else
+@@ -78983,7 +80980,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:80307: checking for tgetent in -ltermcap" >&5
++echo "configure:80984: 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 +80311,7 @@ else
+@@ -78991,7 +80988,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ltermcap  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 78995 "configure"
-+#line 80315 "configure"
++#line 80992 "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 +80322,7 @@ int main() {
+@@ -79002,7 +80999,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:80326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:81003: \"$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 +80469,7 @@ fi
+@@ -79149,7 +81146,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:80473: checking for readline in -lreadline" >&5
++echo "configure:81150: 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 +80477,7 @@ else
+@@ -79157,7 +81154,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lreadline  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 79161 "configure"
-+#line 80481 "configure"
++#line 81158 "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 +80488,7 @@ int main() {
+@@ -79168,7 +81165,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:80492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:81169: \"$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 +80717,7 @@ fi
+@@ -79397,7 +81394,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:80721: checking for rl_pending_input in -lreadline" >&5
++echo "configure:81398: 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 +80725,7 @@ else
+@@ -79405,7 +81402,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lreadline  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 79409 "configure"
-+#line 80729 "configure"
++#line 81406 "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 +80736,7 @@ int main() {
+@@ -79416,7 +81413,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:80740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:81417: \"$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 +80867,7 @@ fi
+@@ -79547,7 +81544,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:80871: checking for rl_callback_read_char in -lreadline" >&5
++echo "configure:81548: 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 +80875,7 @@ else
+@@ -79555,7 +81552,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lreadline  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 79559 "configure"
-+#line 80879 "configure"
++#line 81556 "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 +80886,7 @@ int main() {
+@@ -79566,7 +81563,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:80890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:81567: \"$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 +80970,7 @@ elif test "$PHP_LIBEDIT" != "no"; then
+@@ -79650,7 +81647,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:80974: checking for tgetent in -lncurses" >&5
++echo "configure:81651: 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 +80978,7 @@ else
+@@ -79658,7 +81655,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lncurses  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 79662 "configure"
-+#line 80982 "configure"
++#line 81659 "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 +80989,7 @@ int main() {
+@@ -79669,7 +81666,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:80993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:81670: \"$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 +81033,7 @@ else
+@@ -79713,7 +81710,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:81037: checking for tgetent in -ltermcap" >&5
++echo "configure:81714: 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 +81041,7 @@ else
+@@ -79721,7 +81718,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ltermcap  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 79725 "configure"
-+#line 81045 "configure"
++#line 81722 "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 +81052,7 @@ int main() {
+@@ -79732,7 +81729,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:81056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:81733: \"$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 +81198,7 @@ fi
+@@ -79878,7 +81875,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:81202: checking for readline in -ledit" >&5
++echo "configure:81879: 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 +81206,7 @@ else
+@@ -79886,7 +81883,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ledit  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 79890 "configure"
-+#line 81210 "configure"
++#line 81887 "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 +81217,7 @@ int main() {
+@@ -79897,7 +81894,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:81221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:81898: \"$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 +81358,12 @@ if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then
+@@ -80038,12 +82035,12 @@ if test "$PHP_READLINE" != "no" || test
    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:81362: checking for $ac_func" >&5
++echo "configure:82039: 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 81367 "configure"
++#line 82044 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -80066,7 +81386,7 @@ $ac_func();
+@@ -80066,7 +82063,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:81390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:82067: \"$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 +81712,7 @@ fi
+@@ -80392,7 +82389,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:81716: checking for recode support" >&5
++echo "configure:82393: 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 +81876,7 @@ if test "$PHP_RECODE" != "no"; then
+@@ -80556,7 +82553,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:81880: checking for recode_format_table in -lrecode" >&5
++echo "configure:82557: 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 +81884,7 @@ else
+@@ -80564,7 +82561,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lrecode  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 80568 "configure"
-+#line 81888 "configure"
++#line 82565 "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 +81895,7 @@ int main() {
+@@ -80575,7 +82572,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:81899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:82576: \"$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 +82025,7 @@ else
+@@ -80705,7 +82702,7 @@ else
      LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB"
      LIBS="$LIBS -lrecode"
      cat > conftest.$ac_ext <<EOF
 -#line 80709 "configure"
-+#line 82029 "configure"
++#line 82706 "configure"
  #include "confdefs.h"
  
  char *program_name;
-@@ -80716,7 +82036,7 @@ recode_format_table();
+@@ -80716,7 +82713,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:82040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:82717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    
        
-@@ -80879,17 +82199,17 @@ EOF
+@@ -80879,17 +82876,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:82203: checking for $ac_hdr" >&5
++echo "configure:82880: 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 82208 "configure"
++#line 82885 "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:82213: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:82890: \"$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 +82832,7 @@ EOF
+@@ -81512,7 +83509,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:82836: checking whether to enable PHP sessions" >&5
++echo "configure:83513: 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 +82876,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -81556,7 +83553,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:82880: checking for mm support" >&5
++echo "configure:83557: 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 +82898,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -81578,7 +83575,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:82902: checking whether pwrite works" >&5
++echo "configure:83579: 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 +82910,7 @@ else
+@@ -81590,7 +83587,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 81594 "configure"
-+#line 82914 "configure"
++#line 83591 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -81611,7 +82931,7 @@ else
+@@ -81611,7 +83608,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:82935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:83612: \"$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 +82956,7 @@ fi
+@@ -81636,7 +83633,7 @@ fi
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 81640 "configure"
-+#line 82960 "configure"
++#line 83637 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -81657,7 +82977,7 @@ ssize_t pwrite(int, void *, size_t, off64_t);
+@@ -81657,7 +83654,7 @@ ssize_t pwrite(int, void *, size_t, off6
  
    
  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:82981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:83658: \"$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 +83018,7 @@ EOF
+@@ -81698,7 +83695,7 @@ EOF
  
    
    echo $ac_n "checking whether pread works""... $ac_c" 1>&6
 -echo "configure:81702: checking whether pread works" >&5
-+echo "configure:83022: checking whether pread works" >&5
++echo "configure:83699: 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 +83031,7 @@ else
+@@ -81711,7 +83708,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 81715 "configure"
-+#line 83035 "configure"
++#line 83712 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -81731,7 +83051,7 @@ else
+@@ -81731,7 +83728,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:83055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:83732: \"$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 +83078,7 @@ fi
+@@ -81758,7 +83755,7 @@ fi
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 81762 "configure"
-+#line 83082 "configure"
++#line 83759 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -81778,7 +83098,7 @@ ssize_t pread(int, void *, size_t, off64_t);
+@@ -81778,7 +83775,7 @@ ssize_t pread(int, void *, size_t, off64
      }
    
  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:83102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:83779: \"$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 +83662,7 @@ fi
+@@ -82342,7 +84339,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:83666: checking whether to enable shmop support" >&5
++echo "configure:84343: 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 +84006,7 @@ fi
+@@ -82686,7 +84683,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:84010: checking whether to enable SimpleXML support" >&5
++echo "configure:84687: 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 +84051,7 @@ if test -z "$PHP_LIBXML_DIR"; then
+@@ -82731,7 +84728,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:84055: checking libxml2 install dir" >&5
++echo "configure:84732: 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 +84079,7 @@ if test "$PHP_SIMPLEXML" != "no"; then
+@@ -82759,7 +84756,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:84083: checking for xml2-config path" >&5
++echo "configure:84760: 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 +84237,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
+@@ -82917,7 +84914,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
  
  
              echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
 -echo "configure:82921: checking whether libxml build works" >&5
-+echo "configure:84241: checking whether libxml build works" >&5
++echo "configure:84918: 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 +84253,7 @@ else
+@@ -82933,7 +84930,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 82937 "configure"
-+#line 84257 "configure"
++#line 84934 "configure"
  #include "confdefs.h"
  
      
-@@ -82944,7 +84264,7 @@ else
+@@ -82944,7 +84941,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:84268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:84945: \"$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 +84652,7 @@ fi
+@@ -83332,7 +85329,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:84656: checking for SNMP support" >&5
++echo "configure:85333: 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 +84696,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -83376,7 +85373,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:84700: checking OpenSSL dir for SNMP" >&5
++echo "configure:85377: 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 +84719,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -83399,7 +85396,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:84723: checking whether to enable UCD SNMP hack" >&5
++echo "configure:85400: 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 +84744,7 @@ if test "$PHP_SNMP" != "no"; then
+@@ -83424,7 +85421,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:84748: checking for $ac_word" >&5
++echo "configure:85425: 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 +84945,17 @@ EOF
+@@ -83625,17 +85622,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:84949: checking for $ac_hdr" >&5
++echo "configure:85626: 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 84954 "configure"
++#line 85631 "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:84959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:85636: \"$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 +84983,9 @@ done
+@@ -83663,9 +85660,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:84987: checking for OpenSSL support in SNMP libraries" >&5
++echo "configure:85664: checking for OpenSSL support in SNMP libraries" >&5
        cat > conftest.$ac_ext <<EOF
 -#line 83669 "configure"
-+#line 84989 "configure"
++#line 85666 "configure"
  #include "confdefs.h"
  
  #include <ucd-snmp-config.h>
-@@ -83720,7 +85040,7 @@ rm -f conftest*
+@@ -83720,7 +85717,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:85044: checking for $ac_word" >&5
++echo "configure:85721: 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 +85245,9 @@ fi
+@@ -83925,9 +85922,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:85249: checking for OpenSSL version" >&5
++echo "configure:85926: checking for OpenSSL version" >&5
      cat > conftest.$ac_ext <<EOF
 -#line 83931 "configure"
-+#line 85251 "configure"
++#line 85928 "configure"
  #include "confdefs.h"
  
  #include <openssl/opensslv.h>
-@@ -84082,7 +85402,7 @@ rm -f conftest*
+@@ -84082,7 +86079,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:85406: checking for CRYPTO_free in -lcrypto" >&5
++echo "configure:86083: 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 +85410,7 @@ else
+@@ -84090,7 +86087,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lcrypto  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 84094 "configure"
-+#line 85414 "configure"
++#line 86091 "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 +85421,7 @@ int main() {
+@@ -84101,7 +86098,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:85425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:86102: \"$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 +85578,7 @@ fi
+@@ -84258,7 +86255,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:85582: checking for SSL_CTX_set_ssl_version in -lssl" >&5
++echo "configure:86259: 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 +85586,7 @@ else
+@@ -84266,7 +86263,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lssl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 84270 "configure"
-+#line 85590 "configure"
++#line 86267 "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 +85597,7 @@ int main() {
+@@ -84277,7 +86274,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:85601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:86278: \"$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 +85710,7 @@ else
+@@ -84390,7 +86387,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:85714: checking for kstat_read in -lkstat" >&5
++echo "configure:86391: 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 +85718,7 @@ else
+@@ -84398,7 +86395,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lkstat  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 84402 "configure"
-+#line 85722 "configure"
++#line 86399 "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 +85729,7 @@ int main() {
+@@ -84409,7 +86406,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:85733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:86410: \"$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 +86000,7 @@ fi
+@@ -84680,7 +86677,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:86004: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5
++echo "configure:86681: 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 +86008,7 @@ else
+@@ -84688,7 +86685,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$SNMP_LIBNAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 84692 "configure"
-+#line 86012 "configure"
++#line 86689 "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 +86019,7 @@ int main() {
+@@ -84699,7 +86696,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:86023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:86700: \"$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 +86153,7 @@ fi
+@@ -84833,7 +86830,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:86157: checking for init_snmp in -l$SNMP_LIBNAME" >&5
++echo "configure:86834: 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 +86161,7 @@ else
+@@ -84841,7 +86838,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$SNMP_LIBNAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 84845 "configure"
-+#line 86165 "configure"
++#line 86842 "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 +86172,7 @@ int main() {
+@@ -84852,7 +86849,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:86176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:86853: \"$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 +86519,7 @@ fi
+@@ -85199,7 +87196,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:86523: checking whether to enable SOAP support" >&5
++echo "configure:87200: 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 +86564,7 @@ if test -z "$PHP_LIBXML_DIR"; then
+@@ -85244,7 +87241,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:86568: checking libxml2 install dir" >&5
++echo "configure:87245: 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 +86592,7 @@ if test "$PHP_SOAP" != "no"; then
+@@ -85272,7 +87269,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:86596: checking for xml2-config path" >&5
++echo "configure:87273: 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 +86750,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
+@@ -85430,7 +87427,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
  
  
              echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
 -echo "configure:85434: checking whether libxml build works" >&5
-+echo "configure:86754: checking whether libxml build works" >&5
++echo "configure:87431: 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 +86766,7 @@ else
+@@ -85446,7 +87443,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 85450 "configure"
-+#line 86770 "configure"
++#line 87447 "configure"
  #include "confdefs.h"
  
      
-@@ -85457,7 +86777,7 @@ else
+@@ -85457,7 +87454,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:86781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:87458: \"$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 +87127,7 @@ fi
+@@ -85807,7 +87804,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:87131: checking whether to enable sockets support" >&5
++echo "configure:87808: 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 +87169,13 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -85849,13 +87846,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:87173: checking for struct cmsghdr" >&5
++echo "configure:87850: 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 87179 "configure"
++#line 87856 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -85864,7 +87184,7 @@ int main() {
+@@ -85864,7 +87861,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:87188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:87865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_cmsghdr=yes
  else
-@@ -85889,12 +87209,12 @@ EOF
+@@ -85889,12 +87886,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:87213: checking for $ac_func" >&5
++echo "configure:87890: 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 87218 "configure"
++#line 87895 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -85917,7 +87237,7 @@ $ac_func();
+@@ -85917,7 +87914,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:87241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:87918: \"$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 +87265,17 @@ done
+@@ -85945,17 +87942,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:87269: checking for $ac_hdr" >&5
++echo "configure:87946: 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 87274 "configure"
++#line 87951 "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:87279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:87956: \"$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 +87302,7 @@ fi
+@@ -85982,7 +87979,7 @@ fi
  done
  
    cat > conftest.$ac_ext <<EOF
 -#line 85986 "configure"
-+#line 87306 "configure"
++#line 87983 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -85992,7 +87312,7 @@ int main() {
+@@ -85992,7 +87989,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:87316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:87993: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -86326,7 +87646,7 @@ fi
+@@ -86326,7 +88323,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:87650: checking whether zend_object_value is packed" >&5
++echo "configure:88327: 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 +87656,7 @@ echo "configure:86330: checking whether zend_object_value is packed" >&5
+@@ -86336,7 +88333,7 @@ echo "configure:86330: checking whether
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 86340 "configure"
-+#line 87660 "configure"
++#line 88337 "configure"
  #include "confdefs.h"
  
  #include "Zend/zend_types.h"
-@@ -86345,7 +87665,7 @@ int main(int argc, char **argv) {
+@@ -86345,7 +88342,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:87669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:88346: \"$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 +88029,7 @@ but you've either not enabled pcre, or have disabled it.
+@@ -86709,7 +88706,7 @@ but you've either not enabled pcre, or h
  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:88033: checking for sqlite support" >&5
++echo "configure:88710: 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 +88073,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -86753,7 +88750,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:88077: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5
++echo "configure:88754: 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 +88101,13 @@ if test "$PHP_SQLITE" != "no"; then
+@@ -86781,13 +88778,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:88105: checking for PDO includes" >&5
++echo "configure:88782: 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:88111: checking for PDO includes" >&5
++echo "configure:88788: 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 +88141,7 @@ EOF
+@@ -86821,7 +88818,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:88145: checking for sqlite files in default path" >&5
++echo "configure:88822: 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 +88253,7 @@ echo "configure:86825: checking for sqlite files in default path" >&5
+@@ -86933,7 +88930,7 @@ echo "configure:86825: checking for sqli
    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:88257: checking for sqlite_open in -lsqlite" >&5
++echo "configure:88934: 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 +88261,7 @@ else
+@@ -86941,7 +88938,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsqlite  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 86945 "configure"
-+#line 88265 "configure"
++#line 88942 "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 +88272,7 @@ int main() {
+@@ -86952,7 +88949,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:88276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:88953: \"$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 +88445,7 @@ fi
+@@ -87125,7 +89122,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:88449: checking for $ac_word" >&5
++echo "configure:89126: 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 +88473,7 @@ fi
+@@ -87153,7 +89150,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:88477: checking for lemon version" >&5
++echo "configure:89154: 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 +88886,7 @@ but you've either not enabled pdo, or have disabled it.
+@@ -87566,7 +89563,7 @@ but you've either not enabled pdo, or ha
    
  
      echo $ac_n "checking size of char *""... $ac_c" 1>&6
 -echo "configure:87570: checking size of char *" >&5
-+echo "configure:88890: checking size of char *" >&5
++echo "configure:89567: 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 +88894,19 @@ else
+@@ -87574,18 +89571,19 @@ else
    ac_cv_sizeof_char_p=4
  else
    cat > conftest.$ac_ext <<EOF
 -#line 87578 "configure"
-+#line 88898 "configure"
++#line 89575 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -14273,2647 +16274,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:88910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:89587: \"$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 +88968,12 @@ EOF
+@@ -87647,12 +89645,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:88972: checking for $ac_func" >&5
++echo "configure:89649: 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 88977 "configure"
++#line 89654 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -87675,7 +88996,7 @@ $ac_func();
+@@ -87675,7 +89673,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:89000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:89677: \"$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 +89024,17 @@ done
+@@ -87703,17 +89701,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:89028: checking for $ac_hdr" >&5
++echo "configure:89705: 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 89033 "configure"
++#line 89710 "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:89038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:89715: \"$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 +89065,7 @@ fi
+@@ -87744,7 +89742,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:89069: checking whether flush should be called explicitly after a buffered io" >&5
++echo "configure:89746: 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 +89076,7 @@ if test "$cross_compiling" = yes; then
+@@ -87755,7 +89753,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 87759 "configure"
-+#line 89080 "configure"
++#line 89757 "configure"
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -87793,7 +89114,7 @@ int main(int argc, char **argv)
+@@ -87793,7 +89791,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:89118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:89795: \"$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 +89142,7 @@ fi
+@@ -87821,7 +89819,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:89146: checking for crypt in -lcrypt" >&5
++echo "configure:89823: 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 +89150,7 @@ else
+@@ -87829,7 +89827,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lcrypt  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 87833 "configure"
-+#line 89154 "configure"
++#line 89831 "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 +89161,7 @@ int main() {
+@@ -87840,7 +89838,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:89165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:89842: \"$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 +89190,7 @@ fi
+@@ -87869,7 +89867,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:89194: checking for standard DES crypt" >&5
++echo "configure:89871: 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 +89201,7 @@ else
+@@ -87880,7 +89878,7 @@ else
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 87884 "configure"
-+#line 89205 "configure"
++#line 89882 "configure"
  #include "confdefs.h"
  
  #if HAVE_UNISTD_H
-@@ -87899,7 +89220,7 @@ main() {
+@@ -87899,7 +89897,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:89224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:89901: \"$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 +89241,7 @@ fi
+@@ -87920,7 +89918,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:89245: checking for extended DES crypt" >&5
++echo "configure:89922: 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 +89252,7 @@ else
+@@ -87931,7 +89929,7 @@ else
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 87935 "configure"
-+#line 89256 "configure"
++#line 89933 "configure"
  #include "confdefs.h"
  
  #if HAVE_UNISTD_H
-@@ -87950,7 +89271,7 @@ main() {
+@@ -87950,7 +89948,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:89275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:89952: \"$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 +89292,7 @@ fi
+@@ -87971,7 +89969,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:89296: checking for MD5 crypt" >&5
++echo "configure:89973: 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 +89303,7 @@ if test "$cross_compiling" = yes; then
+@@ -87982,7 +89980,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 87986 "configure"
-+#line 89307 "configure"
++#line 89984 "configure"
  #include "confdefs.h"
  
  #if HAVE_UNISTD_H
-@@ -88010,7 +89331,7 @@ main() {
+@@ -88010,7 +90008,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:89335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:90012: \"$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 +89352,7 @@ fi
+@@ -88031,7 +90029,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:89356: checking for Blowfish crypt" >&5
++echo "configure:90033: 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 +89363,7 @@ if test "$cross_compiling" = yes; then
+@@ -88042,7 +90040,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 88046 "configure"
-+#line 89367 "configure"
++#line 90044 "configure"
  #include "confdefs.h"
  
  #if HAVE_UNISTD_H
-@@ -88067,7 +89388,7 @@ main() {
+@@ -88067,7 +90065,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:89392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:90069: \"$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 +89409,7 @@ fi
+@@ -88088,7 +90086,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:89413: checking for SHA512 crypt" >&5
++echo "configure:90090: 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 +89420,7 @@ if test "$cross_compiling" = yes; then
+@@ -88099,7 +90097,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 88103 "configure"
-+#line 89424 "configure"
++#line 90101 "configure"
  #include "confdefs.h"
  
  #if HAVE_UNISTD_H
-@@ -88123,7 +89444,7 @@ main() {
+@@ -88123,7 +90121,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:89448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:90125: \"$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 +89465,7 @@ fi
+@@ -88144,7 +90142,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:89469: checking for SHA256 crypt" >&5
++echo "configure:90146: 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 +89476,7 @@ if test "$cross_compiling" = yes; then
+@@ -88155,7 +90153,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 88159 "configure"
-+#line 89480 "configure"
++#line 90157 "configure"
  #include "confdefs.h"
  
  #if HAVE_UNISTD_H
-@@ -88179,7 +89500,7 @@ main() {
+@@ -88179,7 +90177,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:89504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:90181: \"$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 +89524,13 @@ echo "$ac_t""$ac_cv_crypt_SHA256" 1>&6
+@@ -88203,13 +90201,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:89528: checking whether the compiler supports __alignof__" >&5
++echo "configure:90205: 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 89534 "configure"
++#line 90211 "configure"
  #include "confdefs.h"
  
    
-@@ -88219,7 +89540,7 @@ int main() {
+@@ -88219,7 +90217,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:89544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:90221: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      ac_cv_alignof_exists=yes
-@@ -88244,13 +89565,13 @@ EOF
+@@ -88244,13 +90242,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:89569: checking whether the compiler supports aligned attribute" >&5
++echo "configure:90246: 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 89575 "configure"
++#line 90252 "configure"
  #include "confdefs.h"
  
    
-@@ -88260,7 +89581,7 @@ int main() {
+@@ -88260,7 +90258,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:89585: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:90262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
      ac_cv_attribute_aligned=yes
-@@ -88439,12 +89760,12 @@ fi
+@@ -88439,12 +90437,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:89764: checking for $ac_func" >&5
++echo "configure:90441: 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 89769 "configure"
++#line 90446 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -88467,7 +89788,7 @@ $ac_func();
+@@ -88467,7 +90465,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:89792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:90469: \"$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 +89813,7 @@ fi
+@@ -88492,7 +90490,7 @@ fi
  done
  
  echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6
 -echo "configure:88496: checking for working fnmatch" >&5
-+echo "configure:89817: checking for working fnmatch" >&5
++echo "configure:90494: 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 +89824,11 @@ if test "$cross_compiling" = yes; then
+@@ -88503,11 +90501,11 @@ if test "$cross_compiling" = yes; then
    ac_cv_func_fnmatch_works=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 88507 "configure"
-+#line 89828 "configure"
++#line 90505 "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:89832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:90509: \"$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 +89855,12 @@ fi
+@@ -88534,12 +90532,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:89859: checking for $ac_func" >&5
++echo "configure:90536: 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 89864 "configure"
++#line 90541 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -88562,7 +89883,7 @@ $ac_func();
+@@ -88562,7 +90560,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:89887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:90564: \"$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 +89913,7 @@ fi
+@@ -88592,7 +90590,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:89917: checking if your OS can spawn processes with inherited handles" >&5
++echo "configure:90594: 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 +89937,12 @@ fi
+@@ -88616,12 +90614,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:89941: checking for res_nsearch" >&5
++echo "configure:90618: 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 89946 "configure"
++#line 90623 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char res_nsearch(); below.  */
-@@ -88644,7 +89965,7 @@ res_nsearch();
+@@ -88644,7 +90642,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:89969: \"$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_func_res_nsearch=yes"
  else
-@@ -88662,12 +89983,12 @@ if eval "test \"`echo '$ac_cv_func_'res_nsearch`\" = yes"; then
+@@ -88662,12 +90660,12 @@ if eval "test \"`echo '$ac_cv_func_'res_
  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:89987: checking for __res_nsearch" >&5
++echo "configure:90664: 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 89992 "configure"
++#line 90669 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __res_nsearch(); below.  */
-@@ -88690,7 +90011,7 @@ __res_nsearch();
+@@ -88690,7 +90688,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:90015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:90692: \"$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 +90049,7 @@ EOF
+@@ -88728,7 +90726,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:90053: checking for res_nsearch in -lresolv" >&5
++echo "configure:90730: 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 +90057,7 @@ else
+@@ -88736,7 +90734,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 88740 "configure"
-+#line 90061 "configure"
++#line 90738 "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 +90068,7 @@ int main() {
+@@ -88747,7 +90745,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:90072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:90749: \"$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 +90088,7 @@ else
+@@ -88767,7 +90765,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:90092: checking for __res_nsearch in -lresolv" >&5
++echo "configure:90769: 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 +90096,7 @@ else
+@@ -88775,7 +90773,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 88779 "configure"
-+#line 90100 "configure"
++#line 90777 "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 +90107,7 @@ int main() {
+@@ -88786,7 +90784,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:90111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:90788: \"$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 +90139,11 @@ fi
+@@ -88818,11 +90816,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 88822 "configure"
-+#line 90143 "configure"
++#line 90820 "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:90147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:90824: \"$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 +90185,7 @@ EOF
+@@ -88864,7 +90862,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:90189: checking for res_nsearch in -lbind" >&5
++echo "configure:90866: 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 +90193,7 @@ else
+@@ -88872,7 +90870,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 88876 "configure"
-+#line 90197 "configure"
++#line 90874 "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 +90204,7 @@ int main() {
+@@ -88883,7 +90881,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:90208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:90885: \"$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 +90224,7 @@ else
+@@ -88903,7 +90901,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:90228: checking for __res_nsearch in -lbind" >&5
++echo "configure:90905: 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 +90232,7 @@ else
+@@ -88911,7 +90909,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 88915 "configure"
-+#line 90236 "configure"
++#line 90913 "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 +90243,7 @@ int main() {
+@@ -88922,7 +90920,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:90247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:90924: \"$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 +90275,11 @@ fi
+@@ -88954,11 +90952,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 88958 "configure"
-+#line 90279 "configure"
++#line 90956 "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:90283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:90960: \"$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 +90321,7 @@ EOF
+@@ -89000,7 +90998,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:90325: checking for res_nsearch in -lsocket" >&5
++echo "configure:91002: 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 +90329,7 @@ else
+@@ -89008,7 +91006,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89012 "configure"
-+#line 90333 "configure"
++#line 91010 "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 +90340,7 @@ int main() {
+@@ -89019,7 +91017,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:90344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91021: \"$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 +90360,7 @@ else
+@@ -89039,7 +91037,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:90364: checking for __res_nsearch in -lsocket" >&5
++echo "configure:91041: 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 +90368,7 @@ else
+@@ -89047,7 +91045,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89051 "configure"
-+#line 90372 "configure"
++#line 91049 "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 +90379,7 @@ int main() {
+@@ -89058,7 +91056,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:90383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91060: \"$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 +90411,11 @@ fi
+@@ -89090,11 +91088,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 89094 "configure"
-+#line 90415 "configure"
++#line 91092 "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:90419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:91096: \"$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 +90472,12 @@ EOF
+@@ -89151,12 +91149,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:90476: checking for dns_search" >&5
++echo "configure:91153: 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 90481 "configure"
++#line 91158 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char dns_search(); below.  */
-@@ -89179,7 +90500,7 @@ dns_search();
+@@ -89179,7 +91177,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:90504: \"$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_func_dns_search=yes"
  else
-@@ -89197,12 +90518,12 @@ if eval "test \"`echo '$ac_cv_func_'dns_search`\" = yes"; then
+@@ -89197,12 +91195,12 @@ if eval "test \"`echo '$ac_cv_func_'dns_
  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:90522: checking for __dns_search" >&5
++echo "configure:91199: 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 90527 "configure"
++#line 91204 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __dns_search(); below.  */
-@@ -89225,7 +90546,7 @@ __dns_search();
+@@ -89225,7 +91223,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:90550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91227: \"$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 +90584,7 @@ EOF
+@@ -89263,7 +91261,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:90588: checking for dns_search in -lresolv" >&5
++echo "configure:91265: 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 +90592,7 @@ else
+@@ -89271,7 +91269,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89275 "configure"
-+#line 90596 "configure"
++#line 91273 "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 +90603,7 @@ int main() {
+@@ -89282,7 +91280,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:90607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91284: \"$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 +90623,7 @@ else
+@@ -89302,7 +91300,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:90627: checking for __dns_search in -lresolv" >&5
++echo "configure:91304: 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 +90631,7 @@ else
+@@ -89310,7 +91308,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89314 "configure"
-+#line 90635 "configure"
++#line 91312 "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 +90642,7 @@ int main() {
+@@ -89321,7 +91319,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:90646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91323: \"$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 +90674,11 @@ fi
+@@ -89353,11 +91351,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 89357 "configure"
-+#line 90678 "configure"
++#line 91355 "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:90682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:91359: \"$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 +90720,7 @@ EOF
+@@ -89399,7 +91397,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:90724: checking for dns_search in -lbind" >&5
++echo "configure:91401: 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 +90728,7 @@ else
+@@ -89407,7 +91405,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89411 "configure"
-+#line 90732 "configure"
++#line 91409 "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 +90739,7 @@ int main() {
+@@ -89418,7 +91416,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:90743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91420: \"$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 +90759,7 @@ else
+@@ -89438,7 +91436,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:90763: checking for __dns_search in -lbind" >&5
++echo "configure:91440: 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 +90767,7 @@ else
+@@ -89446,7 +91444,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89450 "configure"
-+#line 90771 "configure"
++#line 91448 "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 +90778,7 @@ int main() {
+@@ -89457,7 +91455,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:90782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91459: \"$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 +90810,11 @@ fi
+@@ -89489,11 +91487,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 89493 "configure"
-+#line 90814 "configure"
++#line 91491 "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:90818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:91495: \"$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 +90856,7 @@ EOF
+@@ -89535,7 +91533,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:90860: checking for dns_search in -lsocket" >&5
++echo "configure:91537: 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 +90864,7 @@ else
+@@ -89543,7 +91541,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89547 "configure"
-+#line 90868 "configure"
++#line 91545 "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 +90875,7 @@ int main() {
+@@ -89554,7 +91552,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:90879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91556: \"$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 +90895,7 @@ else
+@@ -89574,7 +91572,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:90899: checking for __dns_search in -lsocket" >&5
++echo "configure:91576: 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 +90903,7 @@ else
+@@ -89582,7 +91580,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89586 "configure"
-+#line 90907 "configure"
++#line 91584 "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 +90914,7 @@ int main() {
+@@ -89593,7 +91591,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:90918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91595: \"$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 +90946,11 @@ fi
+@@ -89625,11 +91623,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 89629 "configure"
-+#line 90950 "configure"
++#line 91627 "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:90954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:91631: \"$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 +91007,12 @@ EOF
+@@ -89686,12 +91684,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:91011: checking for dn_expand" >&5
++echo "configure:91688: 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 91016 "configure"
++#line 91693 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char dn_expand(); below.  */
-@@ -89714,7 +91035,7 @@ dn_expand();
+@@ -89714,7 +91712,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:91039: \"$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_func_dn_expand=yes"
  else
-@@ -89732,12 +91053,12 @@ if eval "test \"`echo '$ac_cv_func_'dn_expand`\" = yes"; then
+@@ -89732,12 +91730,12 @@ if eval "test \"`echo '$ac_cv_func_'dn_e
  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:91057: checking for __dn_expand" >&5
++echo "configure:91734: 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 91062 "configure"
++#line 91739 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __dn_expand(); below.  */
-@@ -89760,7 +91081,7 @@ __dn_expand();
+@@ -89760,7 +91758,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:91085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91762: \"$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 +91119,7 @@ EOF
+@@ -89798,7 +91796,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:91123: checking for dn_expand in -lresolv" >&5
++echo "configure:91800: 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 +91127,7 @@ else
+@@ -89806,7 +91804,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89810 "configure"
-+#line 91131 "configure"
++#line 91808 "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 +91138,7 @@ int main() {
+@@ -89817,7 +91815,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:91142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91819: \"$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 +91158,7 @@ else
+@@ -89837,7 +91835,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:91162: checking for __dn_expand in -lresolv" >&5
++echo "configure:91839: 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 +91166,7 @@ else
+@@ -89845,7 +91843,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89849 "configure"
-+#line 91170 "configure"
++#line 91847 "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 +91177,7 @@ int main() {
+@@ -89856,7 +91854,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:91181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91858: \"$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 +91209,11 @@ fi
+@@ -89888,11 +91886,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 89892 "configure"
-+#line 91213 "configure"
++#line 91890 "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:91217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:91894: \"$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 +91255,7 @@ EOF
+@@ -89934,7 +91932,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:91259: checking for dn_expand in -lbind" >&5
++echo "configure:91936: 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 +91263,7 @@ else
+@@ -89942,7 +91940,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89946 "configure"
-+#line 91267 "configure"
++#line 91944 "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 +91274,7 @@ int main() {
+@@ -89953,7 +91951,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:91278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91955: \"$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 +91294,7 @@ else
+@@ -89973,7 +91971,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:91298: checking for __dn_expand in -lbind" >&5
++echo "configure:91975: 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 +91302,7 @@ else
+@@ -89981,7 +91979,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 89985 "configure"
-+#line 91306 "configure"
++#line 91983 "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 +91313,7 @@ int main() {
+@@ -89992,7 +91990,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:91317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:91994: \"$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 +91345,11 @@ fi
+@@ -90024,11 +92022,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 90028 "configure"
-+#line 91349 "configure"
++#line 92026 "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:91353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:92030: \"$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 +91391,7 @@ EOF
+@@ -90070,7 +92068,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:91395: checking for dn_expand in -lsocket" >&5
++echo "configure:92072: 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 +91399,7 @@ else
+@@ -90078,7 +92076,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 90082 "configure"
-+#line 91403 "configure"
++#line 92080 "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 +91410,7 @@ int main() {
+@@ -90089,7 +92087,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:91414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92091: \"$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 +91430,7 @@ else
+@@ -90109,7 +92107,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:91434: checking for __dn_expand in -lsocket" >&5
++echo "configure:92111: 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 +91438,7 @@ else
+@@ -90117,7 +92115,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 90121 "configure"
-+#line 91442 "configure"
++#line 92119 "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 +91449,7 @@ int main() {
+@@ -90128,7 +92126,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:91453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92130: \"$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 +91481,11 @@ fi
+@@ -90160,11 +92158,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 90164 "configure"
-+#line 91485 "configure"
++#line 92162 "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:91489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:92166: \"$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 +91542,12 @@ EOF
+@@ -90221,12 +92219,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:91546: checking for dn_skipname" >&5
++echo "configure:92223: 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 91551 "configure"
++#line 92228 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char dn_skipname(); below.  */
-@@ -90249,7 +91570,7 @@ dn_skipname();
+@@ -90249,7 +92247,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:91574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92251: \"$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 +91588,12 @@ if eval "test \"`echo '$ac_cv_func_'dn_skipname`\" = yes"; then
+@@ -90267,12 +92265,12 @@ if eval "test \"`echo '$ac_cv_func_'dn_s
  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:91592: checking for __dn_skipname" >&5
++echo "configure:92269: 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 91597 "configure"
++#line 92274 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __dn_skipname(); below.  */
-@@ -90295,7 +91616,7 @@ __dn_skipname();
+@@ -90295,7 +92293,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:91620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92297: \"$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 +91654,7 @@ EOF
+@@ -90333,7 +92331,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:91658: checking for dn_skipname in -lresolv" >&5
++echo "configure:92335: 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 +91662,7 @@ else
+@@ -90341,7 +92339,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 90345 "configure"
-+#line 91666 "configure"
++#line 92343 "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 +91673,7 @@ int main() {
+@@ -90352,7 +92350,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:91677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92354: \"$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 +91693,7 @@ else
+@@ -90372,7 +92370,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:91697: checking for __dn_skipname in -lresolv" >&5
++echo "configure:92374: 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 +91701,7 @@ else
+@@ -90380,7 +92378,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 90384 "configure"
-+#line 91705 "configure"
++#line 92382 "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 +91712,7 @@ int main() {
+@@ -90391,7 +92389,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:91716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92393: \"$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 +91744,11 @@ fi
+@@ -90423,11 +92421,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 90427 "configure"
-+#line 91748 "configure"
++#line 92425 "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:91752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:92429: \"$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 +91790,7 @@ EOF
+@@ -90469,7 +92467,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:91794: checking for dn_skipname in -lbind" >&5
++echo "configure:92471: 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 +91798,7 @@ else
+@@ -90477,7 +92475,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 90481 "configure"
-+#line 91802 "configure"
++#line 92479 "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 +91809,7 @@ int main() {
+@@ -90488,7 +92486,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:91813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92490: \"$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 +91829,7 @@ else
+@@ -90508,7 +92506,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:91833: checking for __dn_skipname in -lbind" >&5
++echo "configure:92510: 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 +91837,7 @@ else
+@@ -90516,7 +92514,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 90520 "configure"
-+#line 91841 "configure"
++#line 92518 "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 +91848,7 @@ int main() {
+@@ -90527,7 +92525,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:91852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92529: \"$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 +91880,11 @@ fi
+@@ -90559,11 +92557,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 90563 "configure"
-+#line 91884 "configure"
++#line 92561 "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:91888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:92565: \"$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 +91926,7 @@ EOF
+@@ -90605,7 +92603,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:91930: checking for dn_skipname in -lsocket" >&5
++echo "configure:92607: 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 +91934,7 @@ else
+@@ -90613,7 +92611,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 90617 "configure"
-+#line 91938 "configure"
++#line 92615 "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 +91945,7 @@ int main() {
+@@ -90624,7 +92622,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:91949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92626: \"$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 +91965,7 @@ else
+@@ -90644,7 +92642,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:91969: checking for __dn_skipname in -lsocket" >&5
++echo "configure:92646: 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 +91973,7 @@ else
+@@ -90652,7 +92650,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 90656 "configure"
-+#line 91977 "configure"
++#line 92654 "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 +91984,7 @@ int main() {
+@@ -90663,7 +92661,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:91988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92665: \"$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 +92016,11 @@ fi
+@@ -90695,11 +92693,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 90699 "configure"
-+#line 92020 "configure"
++#line 92697 "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:92024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:92701: \"$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 +92079,12 @@ EOF
+@@ -90758,12 +92756,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:92083: checking for res_search" >&5
++echo "configure:92760: 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 92088 "configure"
++#line 92765 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char res_search(); below.  */
-@@ -90786,7 +92107,7 @@ res_search();
+@@ -90786,7 +92784,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:92111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92788: \"$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 +92125,12 @@ if eval "test \"`echo '$ac_cv_func_'res_search`\" = yes"; then
+@@ -90804,12 +92802,12 @@ if eval "test \"`echo '$ac_cv_func_'res_
  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:92129: checking for __res_search" >&5
++echo "configure:92806: 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 92134 "configure"
++#line 92811 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char __res_search(); below.  */
-@@ -90832,7 +92153,7 @@ __res_search();
+@@ -90832,7 +92830,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:92157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92834: \"$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 +92191,7 @@ EOF
+@@ -90870,7 +92868,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:92195: checking for res_search in -lresolv" >&5
++echo "configure:92872: 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 +92199,7 @@ else
+@@ -90878,7 +92876,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 90882 "configure"
-+#line 92203 "configure"
++#line 92880 "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 +92210,7 @@ int main() {
+@@ -90889,7 +92887,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:92214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92891: \"$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 +92230,7 @@ else
+@@ -90909,7 +92907,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:92234: checking for __res_search in -lresolv" >&5
++echo "configure:92911: 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 +92238,7 @@ else
+@@ -90917,7 +92915,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lresolv  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 90921 "configure"
-+#line 92242 "configure"
++#line 92919 "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 +92249,7 @@ int main() {
+@@ -90928,7 +92926,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:92253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:92930: \"$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 +92281,11 @@ fi
+@@ -90960,11 +92958,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 90964 "configure"
-+#line 92285 "configure"
++#line 92962 "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:92289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:92966: \"$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 +92327,7 @@ EOF
+@@ -91006,7 +93004,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:92331: checking for res_search in -lbind" >&5
++echo "configure:93008: 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 +92335,7 @@ else
+@@ -91014,7 +93012,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 91018 "configure"
-+#line 92339 "configure"
++#line 93016 "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 +92346,7 @@ int main() {
+@@ -91025,7 +93023,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:92350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:93027: \"$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 +92366,7 @@ else
+@@ -91045,7 +93043,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:92370: checking for __res_search in -lbind" >&5
++echo "configure:93047: 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 +92374,7 @@ else
+@@ -91053,7 +93051,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lbind  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 91057 "configure"
-+#line 92378 "configure"
++#line 93055 "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 +92385,7 @@ int main() {
+@@ -91064,7 +93062,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:92389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:93066: \"$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 +92417,11 @@ fi
+@@ -91096,11 +93094,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 91100 "configure"
-+#line 92421 "configure"
++#line 93098 "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:92425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:93102: \"$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 +92463,7 @@ EOF
+@@ -91142,7 +93140,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:92467: checking for res_search in -lsocket" >&5
++echo "configure:93144: 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 +92471,7 @@ else
+@@ -91150,7 +93148,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 91154 "configure"
-+#line 92475 "configure"
++#line 93152 "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 +92482,7 @@ int main() {
+@@ -91161,7 +93159,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:92486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:93163: \"$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 +92502,7 @@ else
+@@ -91181,7 +93179,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:92506: checking for __res_search in -lsocket" >&5
++echo "configure:93183: 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 +92510,7 @@ else
+@@ -91189,7 +93187,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 91193 "configure"
-+#line 92514 "configure"
++#line 93191 "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 +92521,7 @@ int main() {
+@@ -91200,7 +93198,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:92525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:93202: \"$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 +92553,11 @@ fi
+@@ -91232,11 +93230,11 @@ fi
    found=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 91236 "configure"
-+#line 92557 "configure"
++#line 93234 "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:92561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:93238: \"$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 +92610,7 @@ EOF
+@@ -91289,7 +93287,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:92614: checking whether atof() accepts NAN" >&5
++echo "configure:93291: 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 +92621,7 @@ if test "$cross_compiling" = yes; then
+@@ -91300,7 +93298,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 91304 "configure"
-+#line 92625 "configure"
++#line 93302 "configure"
  #include "confdefs.h"
  
  #include <math.h>
-@@ -91320,7 +92641,7 @@ int main(int argc, char** argv)
+@@ -91320,7 +93318,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:92645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:93322: \"$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 +92668,7 @@ EOF
+@@ -91347,7 +93345,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:92672: checking whether atof() accepts INF" >&5
++echo "configure:93349: 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 +92679,7 @@ if test "$cross_compiling" = yes; then
+@@ -91358,7 +93356,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 91362 "configure"
-+#line 92683 "configure"
++#line 93360 "configure"
  #include "confdefs.h"
  
  #include <math.h>
-@@ -91381,7 +92702,7 @@ int main(int argc, char** argv)
+@@ -91381,7 +93379,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:92706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:93383: \"$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 +92729,7 @@ EOF
+@@ -91408,7 +93406,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:92733: checking whether HUGE_VAL == INF" >&5
++echo "configure:93410: 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 +92740,7 @@ if test "$cross_compiling" = yes; then
+@@ -91419,7 +93417,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 91423 "configure"
-+#line 92744 "configure"
++#line 93421 "configure"
  #include "confdefs.h"
  
  #include <math.h>
-@@ -91442,7 +92763,7 @@ int main(int argc, char** argv)
+@@ -91442,7 +93440,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:92767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:93444: \"$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 +92790,7 @@ EOF
+@@ -91469,7 +93467,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:92794: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5
++echo "configure:93471: 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 +92801,7 @@ if test "$cross_compiling" = yes; then
+@@ -91480,7 +93478,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 91484 "configure"
-+#line 92805 "configure"
++#line 93482 "configure"
  #include "confdefs.h"
  
  #include <math.h>
-@@ -91505,7 +92826,7 @@ int main(int argc, char** argv)
+@@ -91505,7 +93503,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:92830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:93507: \"$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 +92853,13 @@ EOF
+@@ -91532,13 +93530,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:92857: checking whether strptime() declaration fails" >&5
++echo "configure:93534: 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 92863 "configure"
++#line 93540 "configure"
  #include "confdefs.h"
  
  #include <time.h>
-@@ -91554,7 +92875,7 @@ int strptime(const char *s, const char *format, struct tm *tm);
+@@ -91554,7 +93552,7 @@ int strptime(const char *s, const char *
  
  ; return 0; }
  EOF
 -if { (eval echo configure:91558: \"$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
++if { (eval echo configure:93556: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
    ac_cv_strptime_decl_fails=no
-@@ -91582,17 +92903,17 @@ for ac_hdr in wchar.h
+@@ -91582,17 +93580,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:92907: checking for $ac_hdr" >&5
++echo "configure:93584: 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 92912 "configure"
++#line 93589 "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:92917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:93594: \"$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 +92942,12 @@ done
+@@ -91621,12 +93619,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:92946: checking for $ac_func" >&5
++echo "configure:93623: 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 92951 "configure"
++#line 93628 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -91649,7 +92970,7 @@ $ac_func();
+@@ -91649,7 +93647,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:92974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:93651: \"$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 +92997,12 @@ done
+@@ -91676,12 +93674,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:93001: checking for $ac_func" >&5
++echo "configure:93678: 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 93006 "configure"
++#line 93683 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -91704,7 +93025,7 @@ $ac_func();
+@@ -91704,7 +93702,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:93029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:93706: \"$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 +93050,13 @@ fi
+@@ -91729,13 +93727,13 @@ fi
  done
  
  echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6
 -echo "configure:91733: checking for mbstate_t" >&5
-+echo "configure:93054: checking for mbstate_t" >&5
++echo "configure:93731: 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 93060 "configure"
++#line 93737 "configure"
  #include "confdefs.h"
  
  #ifdef HAVE_WCHAR_H
-@@ -91748,7 +93069,7 @@ int __tmp__() { mbstate_t a; }
+@@ -91748,7 +93746,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:93073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:93750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
    ac_cv_type_mbstate_t=yes
-@@ -91776,17 +93097,17 @@ for ac_hdr in atomic.h
+@@ -91776,17 +93774,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:93101: checking for $ac_hdr" >&5
++echo "configure:93778: 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 93106 "configure"
++#line 93783 "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:93111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:93788: \"$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 +93497,7 @@ EOF
+@@ -92176,7 +94174,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:93501: checking for Sybase-CT support" >&5
++echo "configure:94178: 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 +94149,7 @@ EOF
+@@ -92828,7 +94826,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:94153: checking for netg_errstr in -lsybtcl64" >&5
++echo "configure:94830: 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 +94157,7 @@ else
+@@ -92836,7 +94834,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsybtcl64  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 92840 "configure"
-+#line 94161 "configure"
++#line 94838 "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 +94168,7 @@ int main() {
+@@ -92847,7 +94845,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:94172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:94849: \"$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 +94343,7 @@ fi
+@@ -93022,7 +95020,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:94347: checking for insck__getVdate in -linsck64" >&5
++echo "configure:95024: 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 +94351,7 @@ else
+@@ -93030,7 +95028,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-linsck64  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 93034 "configure"
-+#line 94355 "configure"
++#line 95032 "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 +94362,7 @@ int main() {
+@@ -93041,7 +95039,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:94366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:95043: \"$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 +94510,7 @@ fi
+@@ -93189,7 +95187,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:94514: checking for bsd_tcp in -linsck64" >&5
++echo "configure:95191: 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 +94518,7 @@ else
+@@ -93197,7 +95195,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-linsck64  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 93201 "configure"
-+#line 94522 "configure"
++#line 95199 "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 +94529,7 @@ int main() {
+@@ -93208,7 +95206,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:94533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:95210: \"$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 +94775,7 @@ fi
+@@ -93454,7 +95452,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:94779: checking for netg_errstr in -lsybtcl" >&5
++echo "configure:95456: 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 +94783,7 @@ else
+@@ -93462,7 +95460,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsybtcl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 93466 "configure"
-+#line 94787 "configure"
++#line 95464 "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 +94794,7 @@ int main() {
+@@ -93473,7 +95471,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:94798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:95475: \"$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 +94969,7 @@ fi
+@@ -93648,7 +95646,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:94973: checking for insck__getVdate in -linsck" >&5
++echo "configure:95650: 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 +94977,7 @@ else
+@@ -93656,7 +95654,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-linsck  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 93660 "configure"
-+#line 94981 "configure"
++#line 95658 "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 +94988,7 @@ int main() {
+@@ -93667,7 +95665,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:94992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:95669: \"$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 +95136,7 @@ fi
+@@ -93815,7 +95813,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:95140: checking for bsd_tcp in -linsck" >&5
++echo "configure:95817: 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 +95144,7 @@ else
+@@ -93823,7 +95821,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-linsck  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 93827 "configure"
-+#line 95148 "configure"
++#line 95825 "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 +95155,7 @@ int main() {
+@@ -93834,7 +95832,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:95159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:95836: \"$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 +95401,7 @@ fi
+@@ -94080,7 +96078,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:95405: checking for netg_errstr in -ltcl" >&5
++echo "configure:96082: 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 +95409,7 @@ else
+@@ -94088,7 +96086,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ltcl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 94092 "configure"
-+#line 95413 "configure"
++#line 96090 "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 +95420,7 @@ int main() {
+@@ -94099,7 +96097,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:95424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:96101: \"$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 +95595,7 @@ fi
+@@ -94274,7 +96272,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:95599: checking for insck__getVdate in -linsck" >&5
++echo "configure:96276: 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 +95603,7 @@ else
+@@ -94282,7 +96280,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-linsck  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 94286 "configure"
-+#line 95607 "configure"
++#line 96284 "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 +95614,7 @@ int main() {
+@@ -94293,7 +96291,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:95618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:96295: \"$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 +95762,7 @@ fi
+@@ -94441,7 +96439,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:95766: checking for bsd_tcp in -linsck" >&5
++echo "configure:96443: 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 +95770,7 @@ else
+@@ -94449,7 +96447,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-linsck  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 94453 "configure"
-+#line 95774 "configure"
++#line 96451 "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 +95781,7 @@ int main() {
+@@ -94460,7 +96458,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:95785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:96462: \"$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 +95841,7 @@ fi
+@@ -94520,7 +96518,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:95845: checking whether to enable System V IPC support" >&5
++echo "configure:96522: 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 +95884,17 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -94563,17 +96561,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:95888: checking for sys/msg.h" >&5
++echo "configure:96565: 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 95893 "configure"
++#line 96570 "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:95898: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:96575: \"$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 +96221,7 @@ fi
+@@ -94900,7 +96898,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:96225: checking whether to enable System V semaphore support" >&5
++echo "configure:96902: 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 +96559,12 @@ EOF
+@@ -95238,12 +97236,12 @@ EOF
  EOF
  
   echo $ac_n "checking for union semun""... $ac_c" 1>&6
 -echo "configure:95242: checking for union semun" >&5
-+echo "configure:96563: checking for union semun" >&5
++echo "configure:97240: 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 96568 "configure"
++#line 97245 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -95254,7 +96575,7 @@ int main() {
+@@ -95254,7 +97252,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:96579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:97256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
       php_cv_semun=yes
-@@ -95290,7 +96611,7 @@ fi
+@@ -95290,7 +97288,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:96615: checking whether to enable System V shared memory support" >&5
++echo "configure:97292: 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 +96955,7 @@ fi
+@@ -95634,7 +97632,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:96959: checking for TIDY support" >&5
++echo "configure:97636: 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 +97244,7 @@ if test "$PHP_TIDY" != "no"; then
+@@ -95923,7 +97921,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:97248: checking for tidyOptGetDoc in -ltidy" >&5
++echo "configure:97925: 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 +97252,7 @@ else
+@@ -95931,7 +97929,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ltidy  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 95935 "configure"
-+#line 97256 "configure"
++#line 97933 "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 +97263,7 @@ int main() {
+@@ -95942,7 +97940,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:97267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:97944: \"$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 +97607,7 @@ fi
+@@ -96286,7 +98284,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:97611: checking whether to enable tokenizer support" >&5
++echo "configure:98288: 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 +97953,7 @@ fi
+@@ -96632,7 +98630,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:97957: checking whether to enable WDDX support" >&5
++echo "configure:98634: 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 +97998,7 @@ if test -z "$PHP_LIBXML_DIR"; then
+@@ -96677,7 +98675,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:98002: checking libxml2 install dir" >&5
++echo "configure:98679: 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 +98022,7 @@ fi
+@@ -96701,7 +98699,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:98026: checking libexpat dir for WDDX" >&5
++echo "configure:98703: 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 +98050,7 @@ if test "$PHP_WDDX" != "no"; then
+@@ -96729,7 +98727,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:98054: checking for xml2-config path" >&5
++echo "configure:98731: 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 +98208,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
+@@ -96887,7 +98885,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
  
  
              echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
 -echo "configure:96891: checking whether libxml build works" >&5
-+echo "configure:98212: checking whether libxml build works" >&5
++echo "configure:98889: 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 +98224,7 @@ else
+@@ -96903,7 +98901,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 96907 "configure"
-+#line 98228 "configure"
++#line 98905 "configure"
  #include "confdefs.h"
  
      
-@@ -96914,7 +98235,7 @@ else
+@@ -96914,7 +98912,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:98239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:98916: \"$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 +98802,7 @@ fi
+@@ -97481,7 +99479,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:98806: checking whether to enable XML support" >&5
++echo "configure:99483: 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 +98847,7 @@ if test -z "$PHP_LIBXML_DIR"; then
+@@ -97526,7 +99524,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:98851: checking libxml2 install dir" >&5
++echo "configure:99528: 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 +98871,7 @@ fi
+@@ -97550,7 +99548,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:98875: checking libexpat install dir" >&5
++echo "configure:99552: 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 +98900,7 @@ if test "$PHP_XML" != "no"; then
+@@ -97579,7 +99577,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:98904: checking for xml2-config path" >&5
++echo "configure:99581: 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 +99058,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
+@@ -97737,7 +99735,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
  
  
              echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
 -echo "configure:97741: checking whether libxml build works" >&5
-+echo "configure:99062: checking whether libxml build works" >&5
++echo "configure:99739: 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 +99074,7 @@ else
+@@ -97753,7 +99751,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 97757 "configure"
-+#line 99078 "configure"
++#line 99755 "configure"
  #include "confdefs.h"
  
      
-@@ -97764,7 +99085,7 @@ else
+@@ -97764,7 +99762,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:99089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:99766: \"$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 +99621,7 @@ fi
+@@ -98300,7 +100298,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:99625: checking whether to enable XMLReader support" >&5
++echo "configure:100302: 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 +99666,7 @@ if test -z "$PHP_LIBXML_DIR"; then
+@@ -98345,7 +100343,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:99670: checking libxml2 install dir" >&5
++echo "configure:100347: 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 +99694,7 @@ if test "$PHP_XMLREADER" != "no"; then
+@@ -98373,7 +100371,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:99698: checking for xml2-config path" >&5
++echo "configure:100375: 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 +99852,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
+@@ -98531,7 +100529,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
  
  
              echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
 -echo "configure:98535: checking whether libxml build works" >&5
-+echo "configure:99856: checking whether libxml build works" >&5
++echo "configure:100533: 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 +99868,7 @@ else
+@@ -98547,7 +100545,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 98551 "configure"
-+#line 99872 "configure"
++#line 100549 "configure"
  #include "confdefs.h"
  
      
-@@ -98558,7 +99879,7 @@ else
+@@ -98558,7 +100556,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:99883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:100560: \"$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 +100261,7 @@ fi
+@@ -98940,7 +100938,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:100265: checking for XMLRPC-EPI support" >&5
++echo "configure:100942: 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 +100306,7 @@ if test -z "$PHP_LIBXML_DIR"; then
+@@ -98985,7 +100983,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:100310: checking libxml2 install dir" >&5
++echo "configure:100987: 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 +100330,7 @@ fi
+@@ -99009,7 +101007,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:100334: checking libexpat dir for XMLRPC-EPI" >&5
++echo "configure:101011: 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 +100353,7 @@ echo "$ac_t""$ext_output" 1>&6
+@@ -99032,7 +101030,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:100357: checking iconv dir for XMLRPC-EPI" >&5
++echo "configure:101034: 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 +100409,7 @@ EOF
+@@ -99088,7 +101086,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:100413: checking for xml2-config path" >&5
++echo "configure:101090: 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 +100567,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
+@@ -99246,7 +101244,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
  
  
              echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
 -echo "configure:99250: checking whether libxml build works" >&5
-+echo "configure:100571: checking whether libxml build works" >&5
++echo "configure:101248: 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 +100583,7 @@ else
+@@ -99262,7 +101260,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 99266 "configure"
-+#line 100587 "configure"
++#line 101264 "configure"
  #include "confdefs.h"
  
      
-@@ -99273,7 +100594,7 @@ else
+@@ -99273,7 +101271,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:100598: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:101275: \"$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 +100863,12 @@ EOF
+@@ -99542,12 +101540,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:100867: checking for iconv" >&5
++echo "configure:101544: 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 100872 "configure"
++#line 101549 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char iconv(); below.  */
-@@ -99570,7 +100891,7 @@ iconv();
+@@ -99570,7 +101568,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:100895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:101572: \"$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 +100912,12 @@ else
+@@ -99591,12 +101589,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:100916: checking for libiconv" >&5
++echo "configure:101593: 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 100921 "configure"
++#line 101598 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char libiconv(); below.  */
-@@ -99619,7 +100940,7 @@ libiconv();
+@@ -99619,7 +101617,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:100944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:101621: \"$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 +101096,7 @@ EOF
+@@ -99775,7 +101773,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:101100: checking for libiconv in -l$iconv_lib_name" >&5
++echo "configure:101777: 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 +101104,7 @@ else
+@@ -99783,7 +101781,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$iconv_lib_name  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 99787 "configure"
-+#line 101108 "configure"
++#line 101785 "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 +101115,7 @@ int main() {
+@@ -99794,7 +101792,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:101119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:101796: \"$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 +101256,7 @@ else
+@@ -99935,7 +101933,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:101260: checking for iconv in -l$iconv_lib_name" >&5
++echo "configure:101937: 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 +101264,7 @@ else
+@@ -99943,7 +101941,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$iconv_lib_name  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 99947 "configure"
-+#line 101268 "configure"
++#line 101945 "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 +101275,7 @@ int main() {
+@@ -99954,7 +101952,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:101279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:101956: \"$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 +101465,7 @@ if test "$PHP_XMLRPC" = "yes"; then
+@@ -100144,7 +102142,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:101469: checking for $ac_word" >&5
++echo "configure:102146: 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 +101493,21 @@ else
+@@ -100172,21 +102170,21 @@ else
  fi
  
  echo $ac_n "checking for inline""... $ac_c" 1>&6
 -echo "configure:100176: checking for inline" >&5
-+echo "configure:101497: checking for inline" >&5
++echo "configure:102174: checking for inline" >&5
  if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -16921,7 +18922,7 @@
  for ac_kw in inline __inline__ __inline; do
    cat > conftest.$ac_ext <<EOF
 -#line 100183 "configure"
-+#line 101504 "configure"
++#line 102181 "configure"
  #include "confdefs.h"
  
  int main() {
@@ -16929,106 +18930,106 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:100190: \"$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
++if { (eval echo configure:102188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_inline=$ac_kw; break
  else
-@@ -100224,12 +101545,12 @@ EOF
+@@ -100224,12 +102222,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:101549: checking for ANSI C header files" >&5
++echo "configure:102226: 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 101554 "configure"
++#line 102231 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
-@@ -100237,7 +101558,7 @@ else
+@@ -100237,7 +102235,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:101562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:102239: \"$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 +101575,7 @@ rm -f conftest*
+@@ -100254,7 +102252,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 101579 "configure"
++#line 102256 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
-@@ -100272,7 +101593,7 @@ fi
+@@ -100272,7 +102270,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 101597 "configure"
++#line 102274 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
-@@ -100293,7 +101614,7 @@ if test "$cross_compiling" = yes; then
+@@ -100293,7 +102291,7 @@ if test "$cross_compiling" = yes; then
    :
  else
    cat > conftest.$ac_ext <<EOF
 -#line 100297 "configure"
-+#line 101618 "configure"
++#line 102295 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-@@ -100304,7 +101625,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+@@ -100304,7 +102302,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
  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:101629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:102306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
-@@ -100331,17 +101652,17 @@ for ac_hdr in xmlparse.h xmltok.h stdlib.h strings.h string.h
+@@ -100331,17 +102329,17 @@ for ac_hdr in xmlparse.h xmltok.h stdlib
  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:101656: checking for $ac_hdr" >&5
++echo "configure:102333: 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 101661 "configure"
++#line 102338 "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:101666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:102343: \"$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 +101694,7 @@ done
+@@ -100373,7 +102371,7 @@ done
  
  
  echo $ac_n "checking size of char""... $ac_c" 1>&6
 -echo "configure:100377: checking size of char" >&5
-+echo "configure:101698: checking size of char" >&5
++echo "configure:102375: 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 +101702,19 @@ else
+@@ -100381,18 +102379,19 @@ else
    ac_cv_sizeof_char=1
  else
    cat > conftest.$ac_ext <<EOF
 -#line 100385 "configure"
-+#line 101706 "configure"
++#line 102383 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -17044,25 +19045,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:101718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:102395: \"$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 +101735,7 @@ EOF
+@@ -100413,7 +102412,7 @@ EOF
  
  
  echo $ac_n "checking size of int""... $ac_c" 1>&6
 -echo "configure:100417: checking size of int" >&5
-+echo "configure:101739: checking size of int" >&5
++echo "configure:102416: 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 +101743,19 @@ else
+@@ -100421,18 +102420,19 @@ else
    ac_cv_sizeof_int=4
  else
    cat > conftest.$ac_ext <<EOF
 -#line 100425 "configure"
-+#line 101747 "configure"
++#line 102424 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -17078,25 +19079,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:101759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:102436: \"$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 +101775,7 @@ EOF
+@@ -100452,7 +102452,7 @@ EOF
  
  
  echo $ac_n "checking size of long""... $ac_c" 1>&6
 -echo "configure:100456: checking size of long" >&5
-+echo "configure:101779: checking size of long" >&5
++echo "configure:102456: 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 +101783,19 @@ else
+@@ -100460,18 +102460,19 @@ else
    ac_cv_sizeof_long=4
  else
    cat > conftest.$ac_ext <<EOF
 -#line 100464 "configure"
-+#line 101787 "configure"
++#line 102464 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -17112,25 +19113,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:101799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:102476: \"$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 +101815,7 @@ EOF
+@@ -100491,7 +102492,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:101819: checking size of long long" >&5
++echo "configure:102496: 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 +101823,19 @@ else
+@@ -100499,18 +102500,19 @@ else
    ac_cv_sizeof_long_long=8
  else
    cat > conftest.$ac_ext <<EOF
 -#line 100503 "configure"
-+#line 101827 "configure"
++#line 102504 "configure"
  #include "confdefs.h"
  #include <stdio.h>
 -int main()
@@ -17146,532 +19147,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:101839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:102516: \"$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 +101855,12 @@ EOF
+@@ -100530,12 +102532,12 @@ EOF
  
  
  echo $ac_n "checking for size_t""... $ac_c" 1>&6
 -echo "configure:100534: checking for size_t" >&5
-+echo "configure:101859: checking for size_t" >&5
++echo "configure:102536: 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 101864 "configure"
++#line 102541 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -100563,12 +101888,12 @@ EOF
+@@ -100563,12 +102565,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:101892: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:102569: 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 101897 "configure"
++#line 102574 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <sys/time.h>
-@@ -100577,7 +101902,7 @@ int main() {
+@@ -100577,7 +102579,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:101906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:102583: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_header_time=yes
  else
-@@ -100598,12 +101923,12 @@ EOF
+@@ -100598,12 +102600,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:101927: checking for uid_t in sys/types.h" >&5
++echo "configure:102604: 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 101932 "configure"
++#line 102609 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  EOF
-@@ -100643,12 +101968,12 @@ for ac_func in \
+@@ -100643,12 +102645,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:101972: checking for $ac_func" >&5
++echo "configure:102649: 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 101977 "configure"
++#line 102654 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -100671,7 +101996,7 @@ $ac_func();
+@@ -100671,7 +102673,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:102000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:102677: \"$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 +102350,7 @@ elif test "$PHP_XMLRPC" != "no"; then
+@@ -101025,7 +103027,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:102354: checking for XMLRPC-EPI in default path" >&5
++echo "configure:103031: 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 +102793,7 @@ fi
+@@ -101468,7 +103470,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:102797: checking whether to enable XMLWriter support" >&5
++echo "configure:103474: 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 +102838,7 @@ if test -z "$PHP_LIBXML_DIR"; then
+@@ -101513,7 +103515,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:102842: checking libxml2 install dir" >&5
++echo "configure:103519: 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 +102866,7 @@ if test "$PHP_XMLWRITER" != "no"; then
+@@ -101541,7 +103543,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:102870: checking for xml2-config path" >&5
++echo "configure:103547: 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 +103024,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6
+@@ -101699,7 +103701,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path
  
  
              echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6
 -echo "configure:101703: checking whether libxml build works" >&5
-+echo "configure:103028: checking whether libxml build works" >&5
++echo "configure:103705: 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 +103040,7 @@ else
+@@ -101715,7 +103717,7 @@ else
    
  else
    cat > conftest.$ac_ext <<EOF
 -#line 101719 "configure"
-+#line 103044 "configure"
++#line 103721 "configure"
  #include "confdefs.h"
  
      
-@@ -101726,7 +103051,7 @@ else
+@@ -101726,7 +103728,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:103055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:103732: \"$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 +103401,7 @@ fi
+@@ -102076,7 +104078,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:103405: checking for XSL support" >&5
++echo "configure:104082: 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 +103601,7 @@ if test "$PHP_XSL" != "no"; then
+@@ -102276,7 +104278,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:103605: checking for EXSLT support" >&5
++echo "configure:104282: 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 +104077,7 @@ fi
+@@ -102752,7 +104754,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:104081: checking for zip archive read/writesupport" >&5
++echo "configure:104758: 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 +104122,7 @@ if test -z "$PHP_ZLIB_DIR"; then
+@@ -102797,7 +104799,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:104126: checking for the location of libz" >&5
++echo "configure:104803: 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 +104146,7 @@ fi
+@@ -102821,7 +104823,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:104150: checking pcre install prefix" >&5
++echo "configure:104827: 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 +104190,7 @@ if test "$PHP_ZIP" != "no"; then
+@@ -102865,7 +104867,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:104194: checking for the location of zlib" >&5
++echo "configure:104871: 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 +104328,7 @@ echo "configure:102869: checking for the location of zlib" >&5
+@@ -103003,7 +105005,7 @@ echo "configure:102869: checking for the
      old_CPPFLAGS=$CPPFLAGS
    CPPFLAGS=$INCLUDES
    cat > conftest.$ac_ext <<EOF
 -#line 103007 "configure"
-+#line 104332 "configure"
++#line 105009 "configure"
  #include "confdefs.h"
  
  #include <main/php_config.h>
-@@ -103022,7 +104347,7 @@ else
+@@ -103022,7 +105024,7 @@ else
    rm -rf conftest*
    
      cat > conftest.$ac_ext <<EOF
 -#line 103026 "configure"
-+#line 104351 "configure"
++#line 105028 "configure"
  #include "confdefs.h"
  
  #include <main/php_config.h>
-@@ -103390,7 +104715,7 @@ fi
+@@ -103390,7 +105392,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:104719: checking whether to disable compressed protocol support in mysqlnd" >&5
++echo "configure:105396: 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 +104760,7 @@ if test -z "$PHP_ZLIB_DIR"; then
+@@ -103435,7 +105437,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:104764: checking for the location of libz" >&5
++echo "configure:105441: 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 +105226,7 @@ if test "$PHP_MYSQLND_ENABLED" = "yes" || test "$PHP_MYSQLI" != "no"; then
+@@ -103901,7 +105903,7 @@ if test "$PHP_MYSQLND_ENABLED" = "yes" |
      
    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:105230: checking whether $php_typename exists" >&5
++echo "configure:105907: 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 +105243,7 @@ else
+@@ -103918,7 +105920,7 @@ else
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 103922 "configure"
-+#line 105247 "configure"
++#line 105924 "configure"
  #include "confdefs.h"
  #include <stdio.h>
  #if STDC_HEADERS
-@@ -103948,7 +105273,7 @@ int main()
+@@ -103948,7 +105950,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:105277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:105954: \"$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 +105413,7 @@ if test "$PHP_RECODE" != "no"; then
+@@ -104088,7 +106090,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:105417: checking for hash_insert in -l$MYSQL_LIBNAME" >&5
++echo "configure:106094: 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 +105421,7 @@ else
+@@ -104096,7 +106098,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-l$MYSQL_LIBNAME  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 104100 "configure"
-+#line 105425 "configure"
++#line 106102 "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 +105432,7 @@ int main() {
+@@ -104107,7 +106109,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:105436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:106113: \"$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 +105534,7 @@ fi
+@@ -104209,7 +106211,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:105538: checking whether to install PEAR" >&5
++echo "configure:106215: 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 +105636,7 @@ fi
+@@ -104311,7 +106313,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:105640: checking for bison version" >&5
++echo "configure:106317: 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 +105692,17 @@ dlfcn.h
+@@ -104367,17 +106369,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:105696: checking for $ac_hdr" >&5
++echo "configure:106373: 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 105701 "configure"
++#line 106378 "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:105706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:106383: \"$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 +105730,12 @@ done
+@@ -104405,12 +106407,12 @@ done
  
  
  echo $ac_n "checking for size_t""... $ac_c" 1>&6
 -echo "configure:104409: checking for size_t" >&5
-+echo "configure:105734: checking for size_t" >&5
++echo "configure:106411: 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 105739 "configure"
++#line 106416 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -104438,12 +105763,12 @@ EOF
+@@ -104438,12 +106440,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:105767: checking return type of signal handlers" >&5
++echo "configure:106444: 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 105772 "configure"
++#line 106449 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #include <signal.h>
-@@ -104460,7 +105785,7 @@ int main() {
+@@ -104460,7 +106462,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:105789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:106466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_signal=void
  else
-@@ -104484,12 +105809,12 @@ EOF
+@@ -104484,12 +106486,12 @@ EOF
  
  
  echo $ac_n "checking for uint""... $ac_c" 1>&6
 -echo "configure:104488: checking for uint" >&5
-+echo "configure:105813: checking for uint" >&5
++echo "configure:106490: 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 105818 "configure"
++#line 106495 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -104517,12 +105842,12 @@ EOF
+@@ -104517,12 +106519,12 @@ EOF
  fi
  
  echo $ac_n "checking for ulong""... $ac_c" 1>&6
 -echo "configure:104521: checking for ulong" >&5
-+echo "configure:105846: checking for ulong" >&5
++echo "configure:106523: 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 105851 "configure"
++#line 106528 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
-@@ -104552,9 +105877,9 @@ fi
+@@ -104552,9 +106554,9 @@ fi
  
  
  echo $ac_n "checking for int32_t""... $ac_c" 1>&6
 -echo "configure:104556: checking for int32_t" >&5
-+echo "configure:105881: checking for int32_t" >&5
++echo "configure:106558: checking for int32_t" >&5
  cat > conftest.$ac_ext <<EOF
 -#line 104558 "configure"
-+#line 105883 "configure"
++#line 106560 "configure"
  #include "confdefs.h"
  
  #if HAVE_SYS_TYPES_H  
-@@ -104573,7 +105898,7 @@ if (sizeof (int32_t))
+@@ -104573,7 +106575,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:105902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:106579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
    cat >> confdefs.h <<EOF
-@@ -104592,9 +105917,9 @@ fi
+@@ -104592,9 +106594,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:105921: checking for uint32_t" >&5
++echo "configure:106598: checking for uint32_t" >&5
  cat > conftest.$ac_ext <<EOF
 -#line 104598 "configure"
-+#line 105923 "configure"
++#line 106600 "configure"
  #include "confdefs.h"
  
  #if HAVE_SYS_TYPES_H  
-@@ -104613,7 +105938,7 @@ if (sizeof (uint32_t))
+@@ -104613,7 +106615,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:105942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:106619: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
    cat >> confdefs.h <<EOF
-@@ -104632,12 +105957,12 @@ fi
+@@ -104632,12 +106634,12 @@ fi
  rm -f conftest*
  
  echo $ac_n "checking for vprintf""... $ac_c" 1>&6
 -echo "configure:104636: checking for vprintf" >&5
-+echo "configure:105961: checking for vprintf" >&5
++echo "configure:106638: 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 105966 "configure"
++#line 106643 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char vprintf(); below.  */
-@@ -104660,7 +105985,7 @@ vprintf();
+@@ -104660,7 +106662,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:105989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:106666: \"$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 +106009,12 @@ fi
+@@ -104684,12 +106686,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:106013: checking for _doprnt" >&5
++echo "configure:106690: 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 106018 "configure"
++#line 106695 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char _doprnt(); below.  */
-@@ -104712,7 +106037,7 @@ _doprnt();
+@@ -104712,7 +106714,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:106041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:106718: \"$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 +106062,7 @@ fi
+@@ -104737,7 +106739,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:106066: checking for 8-bit clean memcmp" >&5
++echo "configure:106743: 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 +106070,7 @@ else
+@@ -104745,7 +106747,7 @@ else
    ac_cv_func_memcmp_clean=no
  else
    cat > conftest.$ac_ext <<EOF
 -#line 104749 "configure"
-+#line 106074 "configure"
++#line 106751 "configure"
  #include "confdefs.h"
  
  main()
-@@ -104755,7 +106080,7 @@ main()
+@@ -104755,7 +106757,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:106084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:106761: \"$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 +106100,19 @@ test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}"
+@@ -104775,19 +106777,19 @@ test $ac_cv_func_memcmp_clean = no && LI
  # 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:106104: checking for working alloca.h" >&5
++echo "configure:106781: 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 106109 "configure"
++#line 106786 "configure"
  #include "confdefs.h"
  #include <alloca.h>
  int main() {
@@ -17679,355 +19680,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:106116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:106793: \"$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 +106133,12 @@ EOF
+@@ -104808,12 +106810,12 @@ EOF
  fi
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
 -echo "configure:104812: checking for alloca" >&5
-+echo "configure:106137: checking for alloca" >&5
++echo "configure:106814: 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 106142 "configure"
++#line 106819 "configure"
  #include "confdefs.h"
  
  #ifdef __GNUC__
-@@ -104841,7 +106166,7 @@ int main() {
+@@ -104841,7 +106843,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:106170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:106847: \"$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 +106198,12 @@ EOF
+@@ -104873,12 +106875,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:106202: checking whether alloca needs Cray hooks" >&5
++echo "configure:106879: 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 106207 "configure"
++#line 106884 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
  webecray
-@@ -104903,12 +106228,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
+@@ -104903,12 +106905,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:106232: checking for $ac_func" >&5
++echo "configure:106909: 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 106237 "configure"
++#line 106914 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -104931,7 +106256,7 @@ $ac_func();
+@@ -104931,7 +106933,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:106260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:106937: \"$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 +106283,7 @@ done
+@@ -104958,7 +106960,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:106287: checking stack direction for C alloca" >&5
++echo "configure:106964: 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 +106291,7 @@ else
+@@ -104966,7 +106968,7 @@ else
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
 -#line 104970 "configure"
-+#line 106295 "configure"
++#line 106972 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
-@@ -104985,7 +106310,7 @@ main ()
+@@ -104985,7 +106987,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:106314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:106991: \"$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 +106334,12 @@ fi
+@@ -105009,12 +107011,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:106338: checking for $ac_func" >&5
++echo "configure:107015: 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 106343 "configure"
++#line 107020 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -105037,7 +106362,7 @@ $ac_func();
+@@ -105037,7 +107039,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:106366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:107043: \"$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 +106388,7 @@ done
+@@ -105063,7 +107065,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:106392: checking whether sprintf is broken" >&5
++echo "configure:107069: 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 +106399,11 @@ else
+@@ -105074,11 +107076,11 @@ else
      
  else
    cat > conftest.$ac_ext <<EOF
 -#line 105078 "configure"
-+#line 106403 "configure"
++#line 107080 "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:106407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:107084: \"$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 +106437,12 @@ EOF
+@@ -105112,12 +107114,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:106441: checking for $ac_func" >&5
++echo "configure:107118: 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 106446 "configure"
++#line 107123 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -105140,7 +106465,7 @@ $ac_func();
+@@ -105140,7 +107142,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:106469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:107146: \"$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 +106492,13 @@ done
+@@ -105167,13 +107169,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:106496: checking whether fp_except is defined" >&5
++echo "configure:107173: 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 106502 "configure"
++#line 107179 "configure"
  #include "confdefs.h"
  
  #include <floatingpoint.h>
-@@ -105184,7 +106509,7 @@ fp_except x = (fp_except) 0;
+@@ -105184,7 +107186,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:106513: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:107190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    
       ac_cv_type_fp_except=yes
-@@ -105211,9 +106536,9 @@ EOF
+@@ -105211,9 +107213,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:106540: checking for usable _FPU_SETCW" >&5
++echo "configure:107217: checking for usable _FPU_SETCW" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 105217 "configure"
-+#line 106542 "configure"
++#line 107219 "configure"
  #include "confdefs.h"
  
      #include <fpu_control.h>
-@@ -105233,7 +106558,7 @@ int main() {
+@@ -105233,7 +107235,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:106562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:107239: \"$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 +106579,9 @@ EOF
+@@ -105254,9 +107256,9 @@ EOF
    fi
    
    echo $ac_n "checking for usable fpsetprec""... $ac_c" 1>&6
 -echo "configure:105258: checking for usable fpsetprec" >&5
-+echo "configure:106583: checking for usable fpsetprec" >&5
++echo "configure:107260: checking for usable fpsetprec" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 105260 "configure"
-+#line 106585 "configure"
++#line 107262 "configure"
  #include "confdefs.h"
  
      #include <machine/ieeefp.h>
-@@ -105275,7 +106600,7 @@ int main() {
+@@ -105275,7 +107277,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:106604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:107281: \"$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 +106621,9 @@ EOF
+@@ -105296,9 +107298,9 @@ EOF
    fi
  
    echo $ac_n "checking for usable _controlfp""... $ac_c" 1>&6
 -echo "configure:105300: checking for usable _controlfp" >&5
-+echo "configure:106625: checking for usable _controlfp" >&5
++echo "configure:107302: checking for usable _controlfp" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 105302 "configure"
-+#line 106627 "configure"
++#line 107304 "configure"
  #include "confdefs.h"
  
      #include <float.h>
-@@ -105317,7 +106642,7 @@ int main() {
+@@ -105317,7 +107319,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:106646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:107323: \"$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 +106663,9 @@ EOF
+@@ -105338,9 +107340,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:106667: checking for usable _controlfp_s" >&5
++echo "configure:107344: checking for usable _controlfp_s" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 105344 "configure"
-+#line 106669 "configure"
++#line 107346 "configure"
  #include "confdefs.h"
  
     #include <float.h>
-@@ -105360,7 +106685,7 @@ int main() {
+@@ -105360,7 +107362,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:106689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:107366: \"$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 +106706,9 @@ EOF
+@@ -105381,9 +107383,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:106710: checking whether FPU control word can be manipulated by inline assembler" >&5
++echo "configure:107387: checking whether FPU control word can be manipulated by inline assembler" >&5
    cat > conftest.$ac_ext <<EOF
 -#line 105387 "configure"
-+#line 106712 "configure"
++#line 107389 "configure"
  #include "confdefs.h"
  
      /* nothing */
-@@ -105405,7 +106730,7 @@ int main() {
+@@ -105405,7 +107407,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:106734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:107411: \"$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 +106752,7 @@ EOF
+@@ -105427,7 +107429,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:106756: checking whether double cast to long preserves least significant bits" >&5
++echo "configure:107433: checking whether double cast to long preserves least significant bits" >&5
  
  if test "$cross_compiling" = yes; then
    
-@@ -105435,7 +106760,7 @@ if test "$cross_compiling" = yes; then
+@@ -105435,7 +107437,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 105439 "configure"
-+#line 106764 "configure"
++#line 107441 "configure"
  #include "confdefs.h"
  
  #include <limits.h>
-@@ -105459,7 +106784,7 @@ int main()
+@@ -105459,7 +107461,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:106788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:107465: \"$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 +106810,17 @@ for ac_hdr in dlfcn.h
+@@ -105485,17 +107487,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:106814: checking for $ac_hdr" >&5
++echo "configure:107491: 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 106819 "configure"
++#line 107496 "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:106824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:107501: \"$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 +106848,14 @@ done
+@@ -105523,14 +107525,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:106852: checking whether dlsym() requires a leading underscore in symbol names" >&5
++echo "configure:107529: checking whether dlsym() requires a leading underscore in symbol names" >&5
  if test "$cross_compiling" = yes; then :
    
  else
@@ -18035,54 +20036,54 @@
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 105534 "configure"
-+#line 106859 "configure"
++#line 107536 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -105593,7 +106918,7 @@ int main ()
+@@ -105593,7 +107595,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:106922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
++  if { (eval echo configure:107599: \"$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 +107001,23 @@ fi
+@@ -105676,23 +107678,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:107005: checking virtual machine dispatch method" >&5
++echo "configure:107682: 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:107009: checking whether to enable thread-safety" >&5
++echo "configure:107686: 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:107013: checking whether to enable inline optimization for GCC" >&5
++echo "configure:107690: 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:107017: checking whether to enable Zend debugging" >&5
++echo "configure:107694: 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:107021: checking whether to enable Zend multibyte" >&5
++echo "configure:107698: checking whether to enable Zend multibyte" >&5
  echo "$ac_t""$ZEND_MULTIBYTE" 1>&6
  
  case $PHP_ZEND_VM in
-@@ -105765,21 +107090,21 @@ fi
+@@ -105765,21 +107767,21 @@ fi
  
  
  echo $ac_n "checking for inline""... $ac_c" 1>&6
 -echo "configure:105769: checking for inline" >&5
-+echo "configure:107094: checking for inline" >&5
++echo "configure:107771: checking for inline" >&5
  if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
@@ -18090,7 +20091,7 @@
  for ac_kw in inline __inline__ __inline; do
    cat > conftest.$ac_ext <<EOF
 -#line 105776 "configure"
-+#line 107101 "configure"
++#line 107778 "configure"
  #include "confdefs.h"
  
  int main() {
@@ -18098,363 +20099,363 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:105783: \"$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
++if { (eval echo configure:107785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_inline=$ac_kw; break
  else
-@@ -105808,7 +107133,7 @@ esac
+@@ -105808,7 +107810,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:107137: checking target system is Darwin" >&5
++echo "configure:107814: checking target system is Darwin" >&5
  if echo "$target" | grep "darwin" > /dev/null; then
    cat >> confdefs.h <<\EOF
  #define DARWIN 1
-@@ -105820,7 +107145,7 @@ else
+@@ -105820,7 +107822,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:107149: checking for MM alignment and log values" >&5
++echo "configure:107826: checking for MM alignment and log values" >&5
  
  if test "$cross_compiling" = yes; then
    
-@@ -105828,7 +107153,7 @@ if test "$cross_compiling" = yes; then
+@@ -105828,7 +107830,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 105832 "configure"
-+#line 107157 "configure"
++#line 107834 "configure"
  #include "confdefs.h"
  
  #include <stdio.h>
-@@ -105864,7 +107189,7 @@ int main()
+@@ -105864,7 +107866,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:107193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:107870: \"$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 +107214,7 @@ fi
+@@ -105889,7 +107891,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:107218: checking for memory allocation using mmap(MAP_ANON)" >&5
++echo "configure:107895: checking for memory allocation using mmap(MAP_ANON)" >&5
  
  if test "$cross_compiling" = yes; then
    
-@@ -105897,7 +107222,7 @@ if test "$cross_compiling" = yes; then
+@@ -105897,7 +107899,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 105901 "configure"
-+#line 107226 "configure"
++#line 107903 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -105933,7 +107258,7 @@ int main()
+@@ -105933,7 +107935,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:107262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:107939: \"$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 +107280,7 @@ fi
+@@ -105955,7 +107957,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:107284: checking for memory allocation using mmap("/dev/zero")" >&5
++echo "configure:107961: checking for memory allocation using mmap("/dev/zero")" >&5
  
  if test "$cross_compiling" = yes; then
    
-@@ -105963,7 +107288,7 @@ if test "$cross_compiling" = yes; then
+@@ -105963,7 +107965,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 105967 "configure"
-+#line 107292 "configure"
++#line 107969 "configure"
  #include "confdefs.h"
  
  #include <sys/types.h>
-@@ -106009,7 +107334,7 @@ int main()
+@@ -106009,7 +108011,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:107338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:108015: \"$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 +107358,12 @@ fi
+@@ -106033,12 +108035,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:107362: checking for $ac_func" >&5
++echo "configure:108039: 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 107367 "configure"
++#line 108044 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -106061,7 +107386,7 @@ $ac_func();
+@@ -106061,7 +108063,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:107390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:108067: \"$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 +107453,17 @@ for ac_hdr in stdarg.h
+@@ -106128,17 +108130,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:107457: checking for $ac_hdr" >&5
++echo "configure:108134: 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 107462 "configure"
++#line 108139 "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:107467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:108144: \"$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 +107540,7 @@ if test "$TSRM_PTH" != "no"; then
+@@ -106215,7 +108217,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:107544: checking for GNU Pth" >&5
++echo "configure:108221: 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 +107570,17 @@ elif test "$TSRM_ST" != "no"; then
+@@ -106245,17 +108247,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:107574: checking for $ac_hdr" >&5
++echo "configure:108251: 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 107579 "configure"
++#line 108256 "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:107584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:108261: \"$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 +107610,7 @@ done
+@@ -106285,7 +108287,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:107614: checking for SGI's State Threads" >&5
++echo "configure:108291: checking for SGI's State Threads" >&5
    echo "$ac_t""yes" 1>&6
    cat >> confdefs.h <<\EOF
  #define TSRM_ST 1
-@@ -106324,7 +107649,7 @@ if test "$cross_compiling" = yes; then
+@@ -106324,7 +108326,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 106328 "configure"
-+#line 107653 "configure"
++#line 108330 "configure"
  #include "confdefs.h"
  
  #include <pthread.h>
-@@ -106342,7 +107667,7 @@ int main() {
+@@ -106342,7 +108344,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:107671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:108348: \"$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 +107687,7 @@ fi
+@@ -106362,7 +108364,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:107691: checking for pthreads_cflags" >&5
++echo "configure:108368: 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 +107709,7 @@ if test "$cross_compiling" = yes; then
+@@ -106384,7 +108386,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 106388 "configure"
-+#line 107713 "configure"
++#line 108390 "configure"
  #include "confdefs.h"
  
  #include <pthread.h>
-@@ -106402,7 +107727,7 @@ int main() {
+@@ -106402,7 +108404,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:107731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:108408: \"$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 +107757,7 @@ fi
+@@ -106432,7 +108434,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:107761: checking for pthreads_lib" >&5
++echo "configure:108438: 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 +107779,7 @@ if test "$cross_compiling" = yes; then
+@@ -106454,7 +108456,7 @@ if test "$cross_compiling" = yes; then
  
  else
    cat > conftest.$ac_ext <<EOF
 -#line 106458 "configure"
-+#line 107783 "configure"
++#line 108460 "configure"
  #include "confdefs.h"
  
  #include <pthread.h>
-@@ -106472,7 +107797,7 @@ int main() {
+@@ -106472,7 +108474,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:107801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:108478: \"$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 +107848,7 @@ EOF
+@@ -106523,7 +108525,7 @@ EOF
  
  
    echo $ac_n "checking for POSIX threads""... $ac_c" 1>&6
 -echo "configure:106527: checking for POSIX threads" >&5
-+echo "configure:107852: checking for POSIX threads" >&5
++echo "configure:108529: checking for POSIX threads" >&5
    echo "$ac_t""yes" 1>&6
  fi
  
-@@ -107157,7 +108482,7 @@ fi
+@@ -107157,7 +109159,7 @@ fi
  
  
  echo $ac_n "checking build system type""... $ac_c" 1>&6
 -echo "configure:107161: checking build system type" >&5
-+echo "configure:108486: checking build system type" >&5
++echo "configure:109163: checking build system type" >&5
  
  build_alias=$build
  case "$build_alias" in
-@@ -107186,7 +108511,7 @@ ac_prog=ld
+@@ -107186,7 +109188,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:108515: checking for ld used by $CC" >&5
++echo "configure:109192: checking for ld used by $CC" >&5
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -107216,10 +108541,10 @@ echo "configure:107190: checking for ld used by $CC" >&5
+@@ -107216,10 +109218,10 @@ echo "configure:107190: checking for ld
    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:108545: checking for GNU ld" >&5
++echo "configure:109222: 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:108548: checking for non-GNU ld" >&5
++echo "configure:109225: 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 +108583,7 @@ else
+@@ -107258,7 +109260,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:108587: checking if the linker ($LD) is GNU ld" >&5
++echo "configure:109264: 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 +108603,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
+@@ -107278,7 +109280,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:108607: checking for $LD option to reload object files" >&5
++echo "configure:109284: 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 +108628,7 @@ case $host_os in
+@@ -107303,7 +109305,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:108632: checking for BSD-compatible nm" >&5
++echo "configure:109309: 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 +108681,7 @@ echo "$ac_t""$lt_cv_path_NM" 1>&6
+@@ -107356,7 +109358,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:108685: checking how to recognize dependent libraries" >&5
++echo "configure:109362: 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 +108873,13 @@ deplibs_check_method=$lt_cv_deplibs_check_method
+@@ -107548,13 +109550,13 @@ deplibs_check_method=$lt_cv_deplibs_chec
  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:108877: checking for object suffix" >&5
++echo "configure:109554: 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:108883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:109560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    for ac_file in conftest.*; do
      case $ac_file in
      *.c) ;;
-@@ -107574,7 +108899,7 @@ ac_objext=$ac_cv_objext
+@@ -107574,7 +109576,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:108903: checking for executable suffix" >&5
++echo "configure:109580: 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 +108909,10 @@ else
+@@ -107584,10 +109586,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:108913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
++  if { (eval echo configure:109590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
      for file in conftest.*; do
        case $file in
 -      *.c | *.o | *.obj) ;;
@@ -18462,50 +20463,50 @@
        *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
        esac
      done
-@@ -107630,7 +108955,7 @@ case $host in
+@@ -107630,7 +109632,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:108959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  if { (eval echo configure:109636: \"$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 +108969,8 @@ ia64-*-hpux*)
+@@ -107644,8 +109646,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 108973 "configure"' > conftest.$ac_ext
-+  if { (eval echo configure:108974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  echo '#line 109650 "configure"' > conftest.$ac_ext
++  if { (eval echo configure:109651: \"$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 +109004,7 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
+@@ -107679,7 +109681,7 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc
  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:109008: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  if { (eval echo configure:109685: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
      case `/usr/bin/file conftest.o` in
      *32-bit*)
        case $host in
-@@ -107729,7 +109054,7 @@ s390*-*linux*|sparc*-*linux*)
+@@ -107729,7 +109731,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:109058: checking whether the C compiler needs -belf" >&5
++echo "configure:109735: 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 +109067,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a
+@@ -107742,14 +109744,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext
  cross_compiling=$ac_cv_prog_cc_cross
  
       cat > conftest.$ac_ext <<EOF
 -#line 107746 "configure"
-+#line 109071 "configure"
++#line 109748 "configure"
  #include "confdefs.h"
  
  int main() {
@@ -18513,877 +20514,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:109078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:109755: \"$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 +109102,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
+@@ -107777,7 +109779,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:109106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  if { (eval echo configure:109783: \"$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 +109131,7 @@ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+@@ -107806,7 +109808,7 @@ if test -n "$CXX" && ( test "X$CXX" != "
      ( (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:109135: checking how to run the C++ preprocessor" >&5
++echo "configure:109812: 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 +109144,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
+@@ -107819,12 +109821,12 @@ ac_link='${CXX-g++} -o conftest${ac_exee
  cross_compiling=$ac_cv_prog_cxx_cross
    CXXCPP="${CXX-g++} -E"
    cat > conftest.$ac_ext <<EOF
 -#line 107823 "configure"
-+#line 109148 "configure"
++#line 109825 "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:109153: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:109830: \"$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 +109179,7 @@ fi
+@@ -107854,7 +109856,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:109183: checking the maximum length of command line arguments" >&5
++echo "configure:109860: 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 +109301,7 @@ fi
+@@ -107976,7 +109978,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:109305: checking command to parse $NM output from $compiler object" >&5
++echo "configure:109982: 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 +109405,10 @@ void nm_test_func(){}
+@@ -108080,10 +110082,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:109409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++  if { (eval echo configure:110086: \"$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: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
++    if { (eval echo configure:110089: \"$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 +109459,7 @@ EOF
+@@ -108134,7 +110136,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:109463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++        if { (eval echo configure:110140: \"$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 +109499,7 @@ else
+@@ -108174,7 +110176,7 @@ else
  fi
  
  echo $ac_n "checking for objdir""... $ac_c" 1>&6
 -echo "configure:108178: checking for objdir" >&5
-+echo "configure:109503: checking for objdir" >&5
++echo "configure:110180: 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 +109565,7 @@ with_gnu_ld="$lt_cv_prog_gnu_ld"
+@@ -108240,7 +110242,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:109569: checking for $ac_word" >&5
++echo "configure:110246: 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 +109597,7 @@ if test -n "$ac_tool_prefix"; then
+@@ -108272,7 +110274,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:109601: checking for $ac_word" >&5
++echo "configure:110278: 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 +109632,7 @@ fi
+@@ -108307,7 +110309,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:109636: checking for $ac_word" >&5
++echo "configure:110313: 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 +109664,7 @@ if test -n "$ac_tool_prefix"; then
+@@ -108339,7 +110341,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:109668: checking for $ac_word" >&5
++echo "configure:110345: 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 +109699,7 @@ fi
+@@ -108374,7 +110376,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:109703: checking for $ac_word" >&5
++echo "configure:110380: 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 +109731,7 @@ if test -n "$ac_tool_prefix"; then
+@@ -108406,7 +110408,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:109735: checking for $ac_word" >&5
++echo "configure:110412: 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 +109818,7 @@ case $deplibs_check_method in
+@@ -108493,7 +110495,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:109822: checking for ${ac_tool_prefix}file" >&5
++echo "configure:110499: 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 +109878,7 @@ fi
+@@ -108553,7 +110555,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:109882: checking for file" >&5
++echo "configure:110559: 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 +109950,7 @@ esac
+@@ -108625,7 +110627,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:109954: checking for $ac_word" >&5
++echo "configure:110631: 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 +109982,7 @@ if test -n "$ac_tool_prefix"; then
+@@ -108657,7 +110659,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:109986: checking for $ac_word" >&5
++echo "configure:110663: 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 +110017,7 @@ fi
+@@ -108692,7 +110694,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:110021: checking for $ac_word" >&5
++echo "configure:110698: 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 +110049,7 @@ if test -n "$ac_tool_prefix"; then
+@@ -108724,7 +110726,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:110053: checking for $ac_word" >&5
++echo "configure:110730: 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 +110083,7 @@ fi
+@@ -108758,7 +110760,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:110087: checking for -single_module linker flag" >&5
++echo "configure:110764: 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 +110106,7 @@ fi
+@@ -108781,7 +110783,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:110110: checking for -exported_symbols_list linker flag" >&5
++echo "configure:110787: 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 +110116,12 @@ else
+@@ -108791,12 +110793,12 @@ else
        LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
        
  cat > conftest.$ac_ext <<EOF
 -#line 108795 "configure"
-+#line 110120 "configure"
++#line 110797 "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:110125: \"$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
   lt_cv_ld_exported_symbols_list=yes
    rm -rf conftest*
  else
-@@ -108930,7 +110255,7 @@ if test "$GCC" = yes; then
+@@ -108930,7 +110932,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:110259: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++echo "configure:110936: 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 +110272,11 @@ else
+@@ -108947,11 +110949,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:110276: $lt_compile\"" >&5)
++   (eval echo "\"configure:110953: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "configure:108955: \$? = $ac_status" >&5
-+   echo "configure:110280: \$? = $ac_status" >&5
++   echo "configure:110957: \$? = $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 +110305,7 @@ lt_prog_compiler_pic=
+@@ -108980,7 +110982,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:110309: checking for $compiler option to produce PIC" >&5
++echo "configure:110986: checking for $compiler option to produce PIC" >&5
   
    if test "$GCC" = yes; then
      lt_prog_compiler_wl='-Wl,'
-@@ -109227,7 +110552,7 @@ echo "$ac_t""$lt_prog_compiler_pic" 1>&6
+@@ -109227,7 +111229,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:110556: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
++echo "configure:111233: 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 +110569,11 @@ else
+@@ -109244,11 +111246,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:110573: $lt_compile\"" >&5)
++   (eval echo "\"configure:111250: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "configure:109252: \$? = $ac_status" >&5
-+   echo "configure:110577: \$? = $ac_status" >&5
++   echo "configure:111254: \$? = $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 +110615,7 @@ esac
+@@ -109290,7 +111292,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:110619: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo "configure:111296: 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 +110653,7 @@ fi
+@@ -109328,7 +111330,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:110657: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo "configure:111334: 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 +110673,11 @@ else
+@@ -109348,11 +111350,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:110677: $lt_compile\"" >&5)
++   (eval echo "\"configure:111354: $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:110681: \$? = $ac_status" >&5
++   echo "configure:111358: \$? = $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 +110707,7 @@ hard_links="nottested"
+@@ -109382,7 +111384,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:110711: checking if we can lock with hard links" >&5
++echo "configure:111388: 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 +110724,7 @@ else
+@@ -109399,7 +111401,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:110728: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo "configure:111405: checking whether the $compiler linker ($LD) supports shared libraries" >&5
  
    runpath_var=
    allow_undefined_flag=
-@@ -109810,12 +111135,12 @@ _LT_EOF
+@@ -109810,12 +111812,12 @@ _LT_EOF
         # Determine the default libpath from the value encoded in an empty executable.
         
  cat > conftest.$ac_ext <<EOF
 -#line 109814 "configure"
-+#line 111139 "configure"
++#line 111816 "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:111144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:111821: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -109848,12 +111173,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -109848,12 +111850,12 @@ if test -z "$aix_libpath"; then aix_libp
         # Determine the default libpath from the value encoded in an empty executable.
         
  cat > conftest.$ac_ext <<EOF
 -#line 109852 "configure"
-+#line 111177 "configure"
++#line 111854 "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:111182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:111859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -110343,11 +111668,11 @@ x|xyes)
+@@ -110343,11 +112345,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:111672: checking whether -lc should be explicitly linked in" >&5
++echo "configure:112349: 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:111676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
++      if { (eval echo configure:112353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
          soname=conftest
          lib=conftest
          libobjs=conftest.$ac_objext
-@@ -110361,7 +111686,7 @@ echo "configure:110347: checking whether -lc should be explicitly linked in" >&5
+@@ -110361,7 +112363,7 @@ echo "configure:110347: checking whether
          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: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; }
++        if { (eval echo configure:112367: \"$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 +111705,7 @@ echo "configure:110347: checking whether -lc should be explicitly linked in" >&5
+@@ -110380,7 +112382,7 @@ echo "configure:110347: checking whether
  esac
  
  echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
 -echo "configure:110384: checking dynamic linker characteristics" >&5
-+echo "configure:111709: checking dynamic linker characteristics" >&5
++echo "configure:112386: checking dynamic linker characteristics" >&5
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -111005,7 +112330,7 @@ if test "$GCC" = yes; then
+@@ -111005,7 +113007,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:112334: checking how to hardcode library paths into programs" >&5
++echo "configure:113011: checking how to hardcode library paths into programs" >&5
  hardcode_action=
  if test -n "$hardcode_libdir_flag_spec" || \
     test -n "$runpath_var" || \
-@@ -111043,7 +112368,7 @@ fi
+@@ -111043,7 +113045,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:112372: checking whether stripping libraries is possible" >&5
++echo "configure:113049: 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 +112419,7 @@ else
+@@ -111094,7 +113096,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:112423: checking for dlopen in -ldl" >&5
++echo "configure:113100: 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 +112427,7 @@ else
+@@ -111102,7 +113104,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 111106 "configure"
-+#line 112431 "configure"
++#line 113108 "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 +112438,7 @@ int main() {
+@@ -111113,7 +113115,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:112442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:113119: \"$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 +112467,12 @@ fi
+@@ -111142,12 +113144,12 @@ fi
  
    *)
      echo $ac_n "checking for shl_load""... $ac_c" 1>&6
 -echo "configure:111146: checking for shl_load" >&5
-+echo "configure:112471: checking for shl_load" >&5
++echo "configure:113148: 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 112476 "configure"
++#line 113153 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char shl_load(); below.  */
-@@ -111170,7 +112495,7 @@ shl_load();
+@@ -111170,7 +113172,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:112499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:113176: \"$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 +112513,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
+@@ -111188,7 +113190,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_
  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:112517: checking for shl_load in -ldld" >&5
++echo "configure:113194: 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 +112521,7 @@ else
+@@ -111196,7 +113198,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ldld  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 111200 "configure"
-+#line 112525 "configure"
++#line 113202 "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 +112532,7 @@ int main() {
+@@ -111207,7 +113209,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:112536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:113213: \"$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 +112551,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+@@ -111226,12 +113228,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
  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:112555: checking for dlopen" >&5
++echo "configure:113232: 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 112560 "configure"
++#line 113237 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char dlopen(); below.  */
-@@ -111254,7 +112579,7 @@ dlopen();
+@@ -111254,7 +113256,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:112583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:113260: \"$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 +112597,7 @@ if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
+@@ -111272,7 +113274,7 @@ if eval "test \"`echo '$ac_cv_func_'dlop
  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:112601: checking for dlopen in -ldl" >&5
++echo "configure:113278: 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 +112605,7 @@ else
+@@ -111280,7 +113282,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 111284 "configure"
-+#line 112609 "configure"
++#line 113286 "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 +112616,7 @@ int main() {
+@@ -111291,7 +113293,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:112620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:113297: \"$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 +112635,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+@@ -111310,7 +113312,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
  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:112639: checking for dlopen in -lsvld" >&5
++echo "configure:113316: 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 +112643,7 @@ else
+@@ -111318,7 +113320,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-lsvld  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 111322 "configure"
-+#line 112647 "configure"
++#line 113324 "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 +112654,7 @@ int main() {
+@@ -111329,7 +113331,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:112658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:113335: \"$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 +112673,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+@@ -111348,7 +113350,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
  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:112677: checking for dld_link in -ldld" >&5
++echo "configure:113354: 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 +112681,7 @@ else
+@@ -111356,7 +113358,7 @@ else
    ac_save_LIBS="$LIBS"
  LIBS="-ldld  $LIBS"
  cat > conftest.$ac_ext <<EOF
 -#line 111360 "configure"
-+#line 112685 "configure"
++#line 113362 "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 +112692,7 @@ int main() {
+@@ -111367,7 +113369,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:112696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:113373: \"$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 +112748,7 @@ fi
+@@ -111423,7 +113425,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:112752: checking whether a program can dlopen itself" >&5
++echo "configure:113429: 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 +112758,7 @@ else
+@@ -111433,7 +113435,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 112762 "configure"
++#line 113439 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -111496,7 +112821,7 @@ int main ()
+@@ -111496,7 +113498,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:112825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
++  if { (eval echo configure:113502: \"$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 +112844,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6
+@@ -111519,7 +113521,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:112848: checking whether a statically linked program can dlopen itself" >&5
++echo "configure:113525: 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 +112854,7 @@ else
+@@ -111529,7 +113531,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 112858 "configure"
++#line 113535 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -111592,7 +112917,7 @@ int main ()
+@@ -111592,7 +113594,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:112921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
++  if { (eval echo configure:113598: \"$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 +112958,11 @@ fi
+@@ -111633,11 +113635,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:112962: checking if libtool supports shared libraries" >&5
++echo "configure:113639: 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:112966: checking whether to build shared libraries" >&5
++echo "configure:113643: 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 +112985,7 @@ esac
+@@ -111660,7 +113662,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:112989: checking whether to build static libraries" >&5
++echo "configure:113666: 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 +113671,7 @@ ac_prog=ld
+@@ -112346,7 +114348,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:113675: checking for ld used by $CC" >&5
++echo "configure:114352: checking for ld used by $CC" >&5
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -112376,10 +113701,10 @@ echo "configure:112350: checking for ld used by $CC" >&5
+@@ -112376,10 +114378,10 @@ echo "configure:112350: checking for ld
    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:113705: checking for GNU ld" >&5
++echo "configure:114382: 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:113708: checking for non-GNU ld" >&5
++echo "configure:114385: 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 +113743,7 @@ else
+@@ -112418,7 +114420,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:113747: checking if the linker ($LD) is GNU ld" >&5
++echo "configure:114424: 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 +113809,7 @@ fi
+@@ -112484,7 +114486,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:113813: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo "configure:114490: checking whether the $compiler linker ($LD) supports shared libraries" >&5
  ld_shlibs_CXX=yes
  case $host_os in
    aix3*)
-@@ -112582,12 +113907,12 @@ case $host_os in
+@@ -112582,12 +114584,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 113911 "configure"
++#line 114588 "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:113916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:114593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -112621,12 +113946,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+@@ -112621,12 +114623,12 @@ if test -z "$aix_libpath"; then aix_libp
        # Determine the default libpath from the value encoded in an empty executable.
        
  cat > conftest.$ac_ext <<EOF
 -#line 112625 "configure"
-+#line 113950 "configure"
++#line 114627 "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:113955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:114632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   
  lt_aix_libpath_sed='
      /Import File Strings/,/^$/ {
-@@ -113393,7 +114718,7 @@ private:
+@@ -113393,7 +115395,7 @@ private:
  };
  EOF
  
 -if { (eval echo configure:113397: \"$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
++if { (eval echo configure:115399: \"$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 +114874,7 @@ lt_prog_compiler_pic_CXX=
+@@ -113549,7 +115551,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:114878: checking for $compiler option to produce PIC" >&5
++echo "configure:115555: checking for $compiler option to produce PIC" >&5
   
    # C++ specific cases for pic, static, wl, etc.
    if test "$GXX" = yes; then
-@@ -113846,7 +115171,7 @@ echo "$ac_t""$lt_prog_compiler_pic_CXX" 1>&6
+@@ -113846,7 +115848,7 @@ echo "$ac_t""$lt_prog_compiler_pic_CXX"
  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:115175: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
++echo "configure:115852: 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 +115188,11 @@ else
+@@ -113863,11 +115865,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:115192: $lt_compile\"" >&5)
++   (eval echo "\"configure:115869: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "configure:113871: \$? = $ac_status" >&5
-+   echo "configure:115196: \$? = $ac_status" >&5
++   echo "configure:115873: \$? = $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 +115234,7 @@ esac
+@@ -113909,7 +115911,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:115238: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++echo "configure:115915: 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 +115272,7 @@ fi
+@@ -113947,7 +115949,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:115276: checking if $compiler supports -c -o file.$ac_objext" >&5
++echo "configure:115953: 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 +115292,11 @@ else
+@@ -113967,11 +115969,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:115296: $lt_compile\"" >&5)
++   (eval echo "\"configure:115973: $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:115300: \$? = $ac_status" >&5
++   echo "configure:115977: \$? = $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 +115326,7 @@ hard_links="nottested"
+@@ -114001,7 +116003,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:115330: checking if we can lock with hard links" >&5
++echo "configure:116007: 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 +115343,7 @@ else
+@@ -114018,7 +116020,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:115347: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++echo "configure:116024: 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 +115389,11 @@ x|xyes)
+@@ -114064,11 +116066,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:115393: checking whether -lc should be explicitly linked in" >&5
++echo "configure:116070: 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:115397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
++      if { (eval echo configure:116074: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then
          soname=conftest
          lib=conftest
          libobjs=conftest.$ac_objext
-@@ -114082,7 +115407,7 @@ echo "configure:114068: checking whether -lc should be explicitly linked in" >&5
+@@ -114082,7 +116084,7 @@ echo "configure:114068: checking whether
          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: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; }
++        if { (eval echo configure:116088: \"$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 +115426,7 @@ echo "configure:114068: checking whether -lc should be explicitly linked in" >&5
+@@ -114101,7 +116103,7 @@ echo "configure:114068: checking whether
  esac
  
  echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
 -echo "configure:114105: checking dynamic linker characteristics" >&5
-+echo "configure:115430: checking dynamic linker characteristics" >&5
++echo "configure:116107: checking dynamic linker characteristics" >&5
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -114674,7 +115999,7 @@ if test "$GCC" = yes; then
+@@ -114674,7 +116676,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:116003: checking how to hardcode library paths into programs" >&5
++echo "configure:116680: 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" || \
@@ -19393,7 +21394,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/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
++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/libevent/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 @@
@@ -19464,3 +21465,13 @@
  /*   */
  #undef HAVE_LIBXML
  
+@@ -1886,6 +1934,9 @@
+ /* LDAP SASL support */
+ #undef HAVE_LDAP_SASL
+ 
++/* Whether to build libevent as dynamic module */
++#undef COMPILE_DL_LIBEVENT
++
+ /* whether to have multibyte string support */
+ #undef HAVE_MBSTRING
+